+ +
diff --git a/src/containers/Purchases/PaymentMades/PaymentsLanding/PaymentMadesTable.js b/src/containers/Purchases/PaymentMades/PaymentsLanding/PaymentMadesTable.js index 2fae9a6c0..b72c875ce 100644 --- a/src/containers/Purchases/PaymentMades/PaymentsLanding/PaymentMadesTable.js +++ b/src/containers/Purchases/PaymentMades/PaymentsLanding/PaymentMadesTable.js @@ -16,6 +16,7 @@ import withCurrentOrganization from 'containers/Organization/withCurrentOrganiza import withAlertsActions from 'containers/Alert/withAlertActions'; import withDrawerActions from 'containers/Drawer/withDrawerActions'; +import withSettings from '../../../Settings/withSettings'; import { usePaymentMadesTableColumns, ActionsMenu } from './components'; import { usePaymentMadesListContext } from './PaymentMadesListProvider'; @@ -36,6 +37,9 @@ function PaymentMadesTable({ // #withDrawerActions openDrawer, + + // #withSettings + paymentMadesTableSize, }) { // Payment mades table columns. const columns = usePaymentMadesTableColumns(); @@ -114,6 +118,7 @@ function PaymentMadesTable({ onCellClick={handleCellClick} initialColumnsWidths={initialColumnsWidths} onColumnResizing={handleColumnResizing} + size={paymentMadesTableSize} payload={{ onEdit: handleEditPaymentMade, onDelete: handleDeletePaymentMade, @@ -130,4 +135,7 @@ export default compose( withAlertsActions, withDrawerActions, withCurrentOrganization(), + withSettings(({ billPaymentSettings }) => ({ + paymentMadesTableSize: billPaymentSettings?.tableSize, + })), )(PaymentMadesTable); diff --git a/src/containers/Sales/Estimates/EstimateForm/EstimateForm.js b/src/containers/Sales/Estimates/EstimateForm/EstimateForm.js index 0ee6b7979..2745fbd8d 100644 --- a/src/containers/Sales/Estimates/EstimateForm/EstimateForm.js +++ b/src/containers/Sales/Estimates/EstimateForm/EstimateForm.js @@ -1,9 +1,8 @@ import React, { useMemo } from 'react'; import { Formik, Form } from 'formik'; import { Intent } from '@blueprintjs/core'; -import { FormattedMessage as T } from 'components'; import intl from 'react-intl-universal'; -import { omit, sumBy, isEmpty } from 'lodash'; +import { sumBy, isEmpty } from 'lodash'; import classNames from 'classnames'; import { useHistory } from 'react-router-dom'; @@ -23,10 +22,14 @@ import withSettings from 'containers/Settings/withSettings'; import withCurrentOrganization from 'containers/Organization/withCurrentOrganization'; import { AppToaster } from 'components'; -import { ERROR } from 'common/errors'; import { compose, transactionNumber, orderingLinesIndexes } from 'utils'; import { useEstimateFormContext } from './EstimateFormProvider'; -import { transformToEditForm, defaultEstimate } from './utils'; +import { + transformToEditForm, + defaultEstimate, + transfromsFormValuesToRequest, + handleErrors +} from './utils'; /** * Estimate form. @@ -68,25 +71,9 @@ function EstimateForm({ currency_code: base_currency, }), }), - [estimate, estimateNumber, estimateIncrementMode], + [estimate, estimateNumber, estimateIncrementMode, base_currency], ); - // Transform response errors to fields. - const handleErrors = (errors, { setErrors }) => { - if (errors.some((e) => e.type === ERROR.ESTIMATE_NUMBER_IS_NOT_UNQIUE)) { - setErrors({ - estimate_number: intl.get('estimate_number_is_not_unqiue'), - }); - } - if ( - errors.some((error) => error.type === ERROR.SALE_ESTIMATE_NO_IS_REQUIRED) - ) { - setErrors({ - estimate_number: intl.get('estimate.field.error.estimate_number_required'), - }); - } - }; - // Handles form submit. const handleFormSubmit = ( values, @@ -109,13 +96,10 @@ function EstimateForm({ return; } const form = { - ...omit(values, ['estimate_number_manually', 'estimate_number']), - ...(values.estimate_number_manually && { - estimate_number: values.estimate_number, - }), + ...transfromsFormValuesToRequest(values), delivered: submitPayload.deliver, - entries: entries.map((entry) => ({ ...omit(entry, ['total']) })), }; + // Handle the request success. const onSuccess = (response) => { AppToaster.show({ message: intl.get( @@ -135,7 +119,7 @@ function EstimateForm({ resetForm(); } }; - + // Handle the request error. const onError = ({ response: { data: { errors }, diff --git a/src/containers/Sales/Estimates/EstimateForm/utils.js b/src/containers/Sales/Estimates/EstimateForm/utils.js index cbb3b826d..1ad12c5e5 100644 --- a/src/containers/Sales/Estimates/EstimateForm/utils.js +++ b/src/containers/Sales/Estimates/EstimateForm/utils.js @@ -2,6 +2,8 @@ import React from 'react'; import { useFormikContext } from 'formik'; import moment from 'moment'; import * as R from 'ramda'; +import { omit } from 'lodash'; +import intl from 'react-intl-universal'; import { defaultFastFieldShouldUpdate, transactionNumber, @@ -37,6 +39,11 @@ export const defaultEstimate = { entries: [...repeatValue(defaultEstimateEntry, MIN_LINES_NUMBER)], }; +const ERRORS = { + ESTIMATE_NUMBER_IS_NOT_UNQIUE: 'ESTIMATE.NUMBER.IS.NOT.UNQIUE', + SALE_ESTIMATE_NO_IS_REQUIRED: 'SALE_ESTIMATE_NO_IS_REQUIRED', +}; + export const transformToEditForm = (estimate) => { const initialEntries = [ ...estimate.entries.map((estimate) => ({ @@ -54,8 +61,8 @@ export const transformToEditForm = (estimate) => { return { ...transformToForm(estimate, defaultEstimate), - entries - } + entries, + }; }; /** @@ -106,3 +113,41 @@ export const ITEMS_FILTER_ROLES = JSON.stringify([ comparator: 'equals', }, ]); + +/** + * Transform response errors to fields. + * @param {*} errors + * @param {*} param1 + */ +export const handleErrors = (errors, { setErrors }) => { + if (errors.some((e) => e.type === ERRORS.ESTIMATE_NUMBER_IS_NOT_UNQIUE)) { + setErrors({ + estimate_number: intl.get('estimate_number_is_not_unqiue'), + }); + } + if ( + errors.some((error) => error.type === ERRORS.SALE_ESTIMATE_NO_IS_REQUIRED) + ) { + setErrors({ + estimate_number: intl.get( + 'estimate.field.error.estimate_number_required', + ), + }); + } +}; + +/** + * Transform the form values to request body. + */ +export const transfromsFormValuesToRequest = (values) => { + const entries = values.entries.filter( + (item) => item.item_id && item.quantity, + ); + return { + ...omit(values, ['estimate_number_manually', 'estimate_number']), + ...(values.estimate_number_manually && { + estimate_number: values.estimate_number, + }), + entries: entries.map((entry) => ({ ...omit(entry, ['amount']) })), + }; +}; diff --git a/src/containers/Sales/Estimates/EstimatesLanding/EstimatesActionsBar.js b/src/containers/Sales/Estimates/EstimatesLanding/EstimatesActionsBar.js index eb550c448..e25b09083 100644 --- a/src/containers/Sales/Estimates/EstimatesLanding/EstimatesActionsBar.js +++ b/src/containers/Sales/Estimates/EstimatesLanding/EstimatesActionsBar.js @@ -9,19 +9,23 @@ import { Alignment, } from '@blueprintjs/core'; import { useHistory } from 'react-router-dom'; -import { FormattedMessage as T } from 'components'; import { + FormattedMessage as T, AdvancedFilterPopover, If, DashboardActionViewsList, DashboardFilterButton, + DashboardRowsHeightButton, } from 'components'; import DashboardActionsBar from 'components/Dashboard/DashboardActionsBar'; import withEstimatesActions from './withEstimatesActions'; import withEstimates from './withEstimates'; +import withSettingsActions from 'containers/Settings/withSettingsActions'; +import withSettings from 'containers/Settings/withSettings'; + import { useEstimatesListContext } from './EstimatesListProvider'; import { useRefreshEstimates } from 'hooks/query/estimates'; @@ -36,6 +40,12 @@ function EstimateActionsBar({ // #withEstimates estimatesFilterRoles, + + // #withSettings + estimatesTableSize, + + // #withSettingsActions + addSetting, }) { const history = useHistory(); @@ -61,6 +71,11 @@ function EstimateActionsBar({ refresh(); }; + // Handle table row size change. + const handleTableRowSizeChange = (size) => { + addSetting('salesEstimates', 'tableSize', size); + }; + return ( @@ -118,7 +133,14 @@ function EstimateActionsBar({ icon={} text={} /> + + + + ({ estimatesFilterRoles: estimatesTableState.filterRoles, })), + withSettings(({ estimatesSettings }) => ({ + estimatesTableSize: estimatesSettings?.tableSize, + })), )(EstimateActionsBar); diff --git a/src/containers/Sales/Estimates/EstimatesLanding/EstimatesDataTable.js b/src/containers/Sales/Estimates/EstimatesLanding/EstimatesDataTable.js index f2d0797b4..8e1568d43 100644 --- a/src/containers/Sales/Estimates/EstimatesLanding/EstimatesDataTable.js +++ b/src/containers/Sales/Estimates/EstimatesLanding/EstimatesDataTable.js @@ -10,6 +10,7 @@ import withEstimatesActions from './withEstimatesActions'; import withAlertsActions from 'containers/Alert/withAlertActions'; import withDrawerActions from 'containers/Drawer/withDrawerActions'; import withDialogActions from 'containers/Dialog/withDialogActions'; +import withSettings from '../../../Settings/withSettings'; import { useEstimatesListContext } from './EstimatesListProvider'; import { useMemorizedColumnsWidths } from 'hooks'; @@ -33,6 +34,9 @@ function EstimatesDataTable({ // #withDialogAction openDialog, + + // #withSettings + estimatesTableSize, }) { const history = useHistory(); @@ -135,6 +139,7 @@ function EstimatesDataTable({ onCellClick={handleCellClick} initialColumnsWidths={initialColumnsWidths} onColumnResizing={handleColumnResizing} + size={estimatesTableSize} payload={{ onApprove: handleApproveEstimate, onEdit: handleEditEstimate, @@ -155,4 +160,7 @@ export default compose( withAlertsActions, withDrawerActions, withDialogActions, + withSettings(({ estimatesSettings }) => ({ + estimatesTableSize: estimatesSettings?.tableSize, + })), )(EstimatesDataTable); diff --git a/src/containers/Sales/Invoices/InvoiceForm/InvoiceForm.js b/src/containers/Sales/Invoices/InvoiceForm/InvoiceForm.js index f67a7dc52..e0bddd7fe 100644 --- a/src/containers/Sales/Invoices/InvoiceForm/InvoiceForm.js +++ b/src/containers/Sales/Invoices/InvoiceForm/InvoiceForm.js @@ -25,7 +25,12 @@ import withCurrentOrganization from 'containers/Organization/withCurrentOrganiza import { AppToaster } from 'components'; import { compose, orderingLinesIndexes, transactionNumber } from 'utils'; import { useInvoiceFormContext } from './InvoiceFormProvider'; -import { transformToEditForm, defaultInvoice, transformErrors } from './utils'; +import { + transformToEditForm, + defaultInvoice, + transformErrors, + transformValueToRequest, +} from './utils'; /** * Invoice form. @@ -72,7 +77,7 @@ function InvoiceForm({ currency_code: base_currency, }), }), - [invoice, newInvoice, invoiceNumber, invoiceIncrementMode], + [invoice, newInvoice, invoiceNumber, invoiceIncrementMode, base_currency], ); // Handles form submit. @@ -93,15 +98,13 @@ function InvoiceForm({ setSubmitting(false); return; } + // Transformes the values of the form to request. const form = { - ...omit(values, ['invoice_no', 'invoice_no_manually']), - ...(values.invoice_no_manually && { - invoice_no: values.invoice_no, - }), + ...transformValueToRequest(values), delivered: submitPayload.deliver, from_estimate_id: estimateId, - entries: entries.map((entry) => ({ ...omit(entry, ['total']) })), }; + // Handle the request success. const onSuccess = () => { AppToaster.show({ diff --git a/src/containers/Sales/Invoices/InvoiceForm/utils.js b/src/containers/Sales/Invoices/InvoiceForm/utils.js index 6874b6b0a..7116ba19d 100644 --- a/src/containers/Sales/Invoices/InvoiceForm/utils.js +++ b/src/containers/Sales/Invoices/InvoiceForm/utils.js @@ -1,5 +1,7 @@ import React from 'react'; import moment from 'moment'; +import { Intent } from '@blueprintjs/core'; +import { omit } from 'lodash'; import { compose, transformToForm, @@ -7,7 +9,6 @@ import { transactionNumber, } from 'utils'; import { useFormikContext } from 'formik'; -import { Intent } from '@blueprintjs/core'; import { defaultFastFieldShouldUpdate } from 'utils'; import intl from 'react-intl-universal'; @@ -146,3 +147,20 @@ export const ITEMS_FILTER_ROLES_QUERY = JSON.stringify([ comparator: 'equals', }, ]); + +/** + * Transformes the form values to request body values. + */ +export function transformValueToRequest(values) { + const entries = values.entries.filter( + (item) => item.item_id && item.quantity, + ); + return { + ...omit(values, ['invoice_no', 'invoice_no_manually']), + ...(values.invoice_no_manually && { + invoice_no: values.invoice_no, + }), + entries: entries.map((entry) => ({ ...omit(entry, ['amount']) })), + delivered: false, + }; +} diff --git a/src/containers/Sales/Invoices/InvoicesLanding/InvoicesActionsBar.js b/src/containers/Sales/Invoices/InvoicesLanding/InvoicesActionsBar.js index 4df9c507a..6b03ab3a7 100644 --- a/src/containers/Sales/Invoices/InvoicesLanding/InvoicesActionsBar.js +++ b/src/containers/Sales/Invoices/InvoicesLanding/InvoicesActionsBar.js @@ -13,6 +13,7 @@ import { FormattedMessage as T, AdvancedFilterPopover, DashboardFilterButton, + DashboardRowsHeightButton, } from 'components'; import DashboardActionsBar from 'components/Dashboard/DashboardActionsBar'; @@ -22,6 +23,8 @@ import { If, DashboardActionViewsList } from 'components'; import { useRefreshInvoices } from 'hooks/query/invoices'; import { useInvoicesListContext } from './InvoicesListProvider'; +import withSettingsActions from 'containers/Settings/withSettingsActions'; +import withSettings from 'containers/Settings/withSettings'; import withInvoiceActions from './withInvoiceActions'; import withInvoices from './withInvoices'; @@ -36,6 +39,12 @@ function InvoiceActionsBar({ // #withInvoices invoicesFilterRoles, + + // #withSettings + invoicesTableSize, + + // #withSettingsActions + addSetting, }) { const history = useHistory(); @@ -60,6 +69,11 @@ function InvoiceActionsBar({ refresh(); }; + // Handle table row size change. + const handleTableRowSizeChange = (size) => { + addSetting('salesInvoices', 'tableSize', size); + }; + return ( @@ -114,6 +128,12 @@ function InvoiceActionsBar({ icon={} text={} /> + + + ({ invoicesFilterRoles: invoicesTableState.filterRoles, })), + withSettings(({ invoiceSettings }) => ({ + invoicesTableSize: invoiceSettings?.tableSize, + })), )(InvoiceActionsBar); diff --git a/src/containers/Sales/Invoices/InvoicesLanding/InvoicesDataTable.js b/src/containers/Sales/Invoices/InvoicesLanding/InvoicesDataTable.js index 407e553d0..501618392 100644 --- a/src/containers/Sales/Invoices/InvoicesLanding/InvoicesDataTable.js +++ b/src/containers/Sales/Invoices/InvoicesLanding/InvoicesDataTable.js @@ -16,6 +16,7 @@ import withInvoiceActions from './withInvoiceActions'; import withAlertsActions from 'containers/Alert/withAlertActions'; import withDrawerActions from 'containers/Drawer/withDrawerActions'; import withDialogActions from 'containers/Dialog/withDialogActions'; +import withSettings from '../../../Settings/withSettings'; import { useInvoicesTableColumns, ActionsMenu } from './components'; import { useInvoicesListContext } from './InvoicesListProvider'; @@ -40,6 +41,9 @@ function InvoicesDataTable({ // #withDialogAction openDialog, + + // #withSettings + invoicesTableSize, }) { const history = useHistory(); @@ -135,6 +139,7 @@ function InvoicesDataTable({ onCellClick={handleCellClick} initialColumnsWidths={initialColumnsWidths} onColumnResizing={handleColumnResizing} + size={invoicesTableSize} payload={{ onDelete: handleDeleteInvoice, onDeliver: handleDeliverInvoice, @@ -155,4 +160,7 @@ export default compose( withDrawerActions, withDialogActions, withInvoices(({ invoicesTableState }) => ({ invoicesTableState })), + withSettings(({ invoiceSettings }) => ({ + invoicesTableSize: invoiceSettings?.tableSize, + })), )(InvoicesDataTable); diff --git a/src/containers/Sales/Invoices/InvoicesLanding/components.js b/src/containers/Sales/Invoices/InvoicesLanding/components.js index 8bac61b39..2efde999e 100644 --- a/src/containers/Sales/Invoices/InvoicesLanding/components.js +++ b/src/containers/Sales/Invoices/InvoicesLanding/components.js @@ -55,6 +55,7 @@ export const statusAccessor = (row) => { })} { + addSetting('paymentReceives', 'tableSize', size); + }; + return ( @@ -115,6 +130,13 @@ function PaymentReceiveActionsBar({ icon={} text={} /> + + + + ({ paymentReceivesTableState, paymentFilterConditions: paymentReceivesTableState.filterRoles, })), + withSettings(({ paymentReceiveSettings }) => ({ + paymentReceivesTableSize: paymentReceiveSettings?.tableSize, + })), )(PaymentReceiveActionsBar); diff --git a/src/containers/Sales/PaymentReceives/PaymentsLanding/PaymentReceivesTable.js b/src/containers/Sales/PaymentReceives/PaymentsLanding/PaymentReceivesTable.js index 3d981dc76..5b6682b5d 100644 --- a/src/containers/Sales/PaymentReceives/PaymentsLanding/PaymentReceivesTable.js +++ b/src/containers/Sales/PaymentReceives/PaymentsLanding/PaymentReceivesTable.js @@ -13,6 +13,7 @@ import withPaymentReceives from './withPaymentReceives'; import withPaymentReceivesActions from './withPaymentReceivesActions'; import withAlertsActions from 'containers/Alert/withAlertActions'; import withDrawerActions from 'containers/Drawer/withDrawerActions'; +import withSettings from '../../../Settings/withSettings'; import { usePaymentReceivesColumns, ActionsMenu } from './components'; import { usePaymentReceivesListContext } from './PaymentReceiptsListProvider'; @@ -33,6 +34,9 @@ function PaymentReceivesDataTable({ // #withDrawerActions openDrawer, + + // #withSettings + paymentReceivesTableSize, }) { const history = useHistory(); @@ -115,6 +119,7 @@ function PaymentReceivesDataTable({ onCellClick={handleCellClick} initialColumnsWidths={initialColumnsWidths} onColumnResizing={handleColumnResizing} + size={paymentReceivesTableSize} payload={{ onDelete: handleDeletePaymentReceive, onEdit: handleEditPaymentReceive, @@ -132,4 +137,7 @@ export default compose( withPaymentReceives(({ paymentReceivesTableState }) => ({ paymentReceivesTableState, })), + withSettings(({ paymentReceiveSettings }) => ({ + paymentReceivesTableSize: paymentReceiveSettings?.tableSize, + })), )(PaymentReceivesDataTable); diff --git a/src/containers/Sales/Receipts/ReceiptForm/ReceiptForm.js b/src/containers/Sales/Receipts/ReceiptForm/ReceiptForm.js index 99d42638a..5bd72558b 100644 --- a/src/containers/Sales/Receipts/ReceiptForm/ReceiptForm.js +++ b/src/containers/Sales/Receipts/ReceiptForm/ReceiptForm.js @@ -2,12 +2,11 @@ import React, { useMemo } from 'react'; import { Formik, Form } from 'formik'; import { Intent } from '@blueprintjs/core'; import intl from 'react-intl-universal'; -import { omit, sumBy, isEmpty } from 'lodash'; +import { sumBy, isEmpty } from 'lodash'; import classNames from 'classnames'; import { useHistory } from 'react-router-dom'; import { CLASSES } from 'common/classes'; -import { ERROR } from 'common/errors'; import { EditReceiptFormSchema, CreateReceiptFormSchema, @@ -27,7 +26,12 @@ import withCurrentOrganization from 'containers/Organization/withCurrentOrganiza import { AppToaster } from 'components'; import { compose, orderingLinesIndexes, transactionNumber } from 'utils'; -import { transformToEditForm, defaultReceipt } from './utils'; +import { + transformToEditForm, + defaultReceipt, + handleErrors, + transformFormValuesToRequest, +} from './utils'; /** * Receipt form. @@ -76,20 +80,6 @@ function ReceiptForm({ [receipt, preferredDepositAccount, nextReceiptNumber, receiptAutoIncrement], ); - // Transform response error to fields. - const handleErrors = (errors, { setErrors }) => { - if (errors.some((e) => e.type === ERROR.SALE_RECEIPT_NUMBER_NOT_UNIQUE)) { - setErrors({ - receipt_number: intl.get('sale_receipt_number_not_unique'), - }); - } - if (errors.some((e) => e.type === ERROR.SALE_RECEIPT_NO_IS_REQUIRED)) { - setErrors({ - receipt_number: intl.get('receipt.field.error.receipt_number_required'), - }); - } - }; - // Handle the form submit. const handleFormSubmit = ( values, @@ -109,13 +99,8 @@ function ReceiptForm({ return; } const form = { - ...omit(values, ['receipt_number_manually', 'receipt_number']), - ...(values.receipt_number_manually && { - receipt_number: values.receipt_number, - currency_code: base_currency, - }), + ...transformFormValuesToRequest(values), closed: submitPayload.status, - entries: entries.map((entry) => ({ ...omit(entry, ['total']) })), }; // Handle the request success. const onSuccess = (response) => { diff --git a/src/containers/Sales/Receipts/ReceiptForm/utils.js b/src/containers/Sales/Receipts/ReceiptForm/utils.js index d2462b9b7..482d0d8a9 100644 --- a/src/containers/Sales/Receipts/ReceiptForm/utils.js +++ b/src/containers/Sales/Receipts/ReceiptForm/utils.js @@ -2,6 +2,8 @@ import React from 'react'; import { useFormikContext } from 'formik'; import moment from 'moment'; import * as R from 'ramda'; +import intl from 'react-intl-universal'; +import { omit } from 'lodash'; import { defaultFastFieldShouldUpdate, transactionNumber, @@ -37,6 +39,11 @@ export const defaultReceipt = { entries: [...repeatValue(defaultReceiptEntry, MIN_LINES_NUMBER)], }; +const ERRORS = { + SALE_RECEIPT_NUMBER_NOT_UNIQUE: 'SALE_RECEIPT_NUMBER_NOT_UNIQUE', + SALE_RECEIPT_NO_IS_REQUIRED: 'SALE_RECEIPT_NO_IS_REQUIRED', +}; + /** * Transform to form in edit mode. */ @@ -99,3 +106,39 @@ export const customersFieldShouldUpdate = (newProps, oldProps) => { defaultFastFieldShouldUpdate(newProps, oldProps) ); }; + +/** + * Transform response error to fields. + */ +export const handleErrors = (errors, { setErrors }) => { + if (errors.some((e) => e.type === ERRORS.SALE_RECEIPT_NUMBER_NOT_UNIQUE)) { + setErrors({ + receipt_number: intl.get('sale_receipt_number_not_unique'), + }); + } + if (errors.some((e) => e.type === ERRORS.SALE_RECEIPT_NO_IS_REQUIRED)) { + setErrors({ + receipt_number: intl.get('receipt.field.error.receipt_number_required'), + }); + } +}; + +/** + * Transformes the form values to request body. + * @param {*} values + * @returns + */ +export const transformFormValuesToRequest = (values) => { + const entries = values.entries.filter( + (item) => item.item_id && item.quantity, + ); + + return { + ...omit(values, ['receipt_number_manually', 'receipt_number']), + ...(values.receipt_number_manually && { + receipt_number: values.receipt_number, + }), + entries: entries.map((entry) => ({ ...omit(entry, ['amount']) })), + closed: false, + }; +}; diff --git a/src/containers/Sales/Receipts/ReceiptsLanding/ReceiptActionsBar.js b/src/containers/Sales/Receipts/ReceiptsLanding/ReceiptActionsBar.js index 51867c83c..4f7020d2d 100644 --- a/src/containers/Sales/Receipts/ReceiptsLanding/ReceiptActionsBar.js +++ b/src/containers/Sales/Receipts/ReceiptsLanding/ReceiptActionsBar.js @@ -14,6 +14,7 @@ import { AdvancedFilterPopover, DashboardFilterButton, FormattedMessage as T, + DashboardRowsHeightButton, } from 'components'; import { If, DashboardActionViewsList } from 'components'; @@ -22,6 +23,9 @@ import DashboardActionsBar from 'components/Dashboard/DashboardActionsBar'; import withReceiptsActions from './withReceiptsActions'; import withReceipts from './withReceipts'; +import withSettingsActions from 'containers/Settings/withSettingsActions'; +import withSettings from 'containers/Settings/withSettings'; + import { useReceiptsListContext } from './ReceiptsListProvider'; import { useRefreshReceipts } from 'hooks/query/receipts'; import { compose } from 'utils'; @@ -35,6 +39,12 @@ function ReceiptActionsBar({ // #withReceipts receiptsFilterConditions, + + // #withSettings + receiptsTableSize, + + // #withSettingsActions + addSetting, }) { const history = useHistory(); @@ -60,6 +70,11 @@ function ReceiptActionsBar({ refresh(); }; + // Handle table row size change. + const handleTableRowSizeChange = (size) => { + addSetting('salesReceipts', 'tableSize', size); + }; + return ( @@ -117,6 +132,13 @@ function ReceiptActionsBar({ icon={} text={} /> + + + + ({ receiptsFilterConditions: receiptTableState.filterRoles, })), + withSettings(({ receiptSettings }) => ({ + receiptsTableSize: receiptSettings?.tableSize, + })), )(ReceiptActionsBar); diff --git a/src/containers/Sales/Receipts/ReceiptsLanding/ReceiptsTable.js b/src/containers/Sales/Receipts/ReceiptsLanding/ReceiptsTable.js index 16f6c95a6..e7c73c3b1 100644 --- a/src/containers/Sales/Receipts/ReceiptsLanding/ReceiptsTable.js +++ b/src/containers/Sales/Receipts/ReceiptsLanding/ReceiptsTable.js @@ -14,6 +14,7 @@ import withDrawerActions from 'containers/Drawer/withDrawerActions'; import withDialogActions from 'containers/Dialog/withDialogActions'; import withReceipts from './withReceipts'; import withReceiptsActions from './withReceiptsActions'; +import withSettings from '../../../Settings/withSettings'; import { useReceiptsListContext } from './ReceiptsListProvider'; import { useReceiptsTableColumns, ActionsMenu } from './components'; @@ -37,6 +38,9 @@ function ReceiptsDataTable({ // #withDialogAction openDialog, + + // #withSettings + receiptsTableSize, }) { const history = useHistory(); @@ -125,6 +129,7 @@ function ReceiptsDataTable({ onCellClick={handleCellClick} initialColumnsWidths={initialColumnsWidths} onColumnResizing={handleColumnResizing} + size={receiptsTableSize} payload={{ onEdit: handleEditReceipt, onDelete: handleDeleteReceipt, @@ -145,4 +150,7 @@ export default compose( withReceipts(({ receiptTableState }) => ({ receiptTableState, })), + withSettings(({ receiptSettings }) => ({ + receiptsTableSize: receiptSettings?.tableSize, + })), )(ReceiptsDataTable); diff --git a/src/containers/Settings/withSettings.js b/src/containers/Settings/withSettings.js index 04f104343..2cca4753e 100644 --- a/src/containers/Settings/withSettings.js +++ b/src/containers/Settings/withSettings.js @@ -6,6 +6,7 @@ export default (mapState) => { organizationSettings: state.settings.data.organization, manualJournalsSettings: state.settings.data.manualJournals, billPaymentSettings: state.settings.data.billPayments, + billsettings: state.settings.data.bills, paymentReceiveSettings: state.settings.data.paymentReceives, estimatesSettings: state.settings.data.salesEstimates, receiptSettings: state.settings.data.salesReceipts, @@ -13,6 +14,8 @@ export default (mapState) => { itemsSettings: state.settings.data.items, expenseSettings: state.settings.data.expenses, accountsSettings: state.settings.data.accounts, + customersSettings: state.settings.data.customers, + vendorsSettings: state.settings.data.vendors, }; return mapState ? mapState(mapped, state, props) : mapped; }; diff --git a/src/containers/Settings/withSettingsActions.js b/src/containers/Settings/withSettingsActions.js index 1c02035f3..3cfe2bb5b 100644 --- a/src/containers/Settings/withSettingsActions.js +++ b/src/containers/Settings/withSettingsActions.js @@ -2,11 +2,13 @@ import { connect } from 'react-redux'; import { FetchOptions, submitOptions, + addSettings } from 'store/settings/settings.actions'; export const mapDispatchToProps = (dispatch) => ({ requestSubmitOptions: (form) => dispatch(submitOptions({ form })), requestFetchOptions: () => dispatch(FetchOptions({})), + addSetting: (group, key, value) => dispatch(addSettings(group, key, value)), }); export default connect(null, mapDispatchToProps); diff --git a/src/containers/Subscriptions/BillingForm.js b/src/containers/Subscriptions/BillingForm.js index 7861f7e7c..3b4d4a372 100644 --- a/src/containers/Subscriptions/BillingForm.js +++ b/src/containers/Subscriptions/BillingForm.js @@ -49,7 +49,10 @@ function BillingForm({ // Handle form submitting. const handleSubmit = (values, { setSubmitting }) => { - requestSubmitBilling(values) + requestSubmitBilling({ + ...values, + plan_slug: 'essentials-monthly', + }) .then((response) => { setSubmitting(false); }) diff --git a/src/containers/Vendors/VendorsLanding/VendorActionsBar.js b/src/containers/Vendors/VendorsLanding/VendorActionsBar.js index 6fb00f48e..6f392cb7c 100644 --- a/src/containers/Vendors/VendorsLanding/VendorActionsBar.js +++ b/src/containers/Vendors/VendorsLanding/VendorActionsBar.js @@ -8,14 +8,15 @@ import { Switch, Alignment, } from '@blueprintjs/core'; -import { FormattedMessage as T } from 'components'; import DashboardActionsBar from 'components/Dashboard/DashboardActionsBar'; import Icon from 'components/Icon'; import { If, + FormattedMessage as T, DashboardActionViewsList, DashboardFilterButton, + DashboardRowsHeightButton, AdvancedFilterPopover, } from 'components'; @@ -26,6 +27,9 @@ import { useHistory } from 'react-router-dom'; import withVendorsActions from './withVendorsActions'; import withVendors from './withVendors'; +import withSettingsActions from '../../Settings/withSettingsActions'; +import withSettings from '../../Settings/withSettings'; + import { compose } from 'utils'; /** @@ -38,6 +42,12 @@ function VendorActionsBar({ // #withVendorActions setVendorsTableState, vendorsInactiveMode, + + // #withSettings + vendorsTableSize, + + // #withSettingsActions + addSetting, }) { const history = useHistory(); @@ -68,6 +78,9 @@ function VendorActionsBar({ refresh(); }; + const handleTableRowSizeChange = (size) => { + addSetting('vendors', 'tableSize', size); + }; return ( @@ -117,6 +130,12 @@ function VendorActionsBar({ icon={} text={} /> + + + } defaultChecked={vendorsInactiveMode} @@ -136,8 +155,12 @@ function VendorActionsBar({ export default compose( withVendorsActions, + withSettingsActions, withVendors(({ vendorsTableState }) => ({ vendorsInactiveMode: vendorsTableState.inactiveMode, vendorsFilterConditions: vendorsTableState.filterRoles, })), + withSettings(({ vendorsSettings }) => ({ + vendorsTableSize: vendorsSettings?.tableSize, + })), )(VendorActionsBar); diff --git a/src/containers/Vendors/VendorsLanding/VendorsTable.js b/src/containers/Vendors/VendorsLanding/VendorsTable.js index 2d3640588..fc117d291 100644 --- a/src/containers/Vendors/VendorsLanding/VendorsTable.js +++ b/src/containers/Vendors/VendorsLanding/VendorsTable.js @@ -17,6 +17,7 @@ import withVendors from './withVendors'; import withAlertsActions from 'containers/Alert/withAlertActions'; import withDialogActions from 'containers/Dialog/withDialogActions'; import withDrawerActions from 'containers/Drawer/withDrawerActions'; +import withSettings from '../../Settings/withSettings'; import { ActionsMenu, useVendorsTableColumns } from './components'; @@ -40,6 +41,9 @@ function VendorsTable({ // #withDialogActions openDialog, + + // #withSettings + vendorsTableSize, }) { // Vendors list context. const { @@ -141,6 +145,7 @@ function VendorsTable({ onCellClick={handleCellClick} initialColumnsWidths={initialColumnsWidths} onColumnResizing={handleColumnResizing} + size={vendorsTableSize} payload={{ onEdit: handleEditVendor, onDelete: handleDeleteVendor, @@ -161,4 +166,7 @@ export default compose( withDrawerActions, withVendors(({ vendorsTableState }) => ({ vendorsTableState })), + withSettings(({ vendorsSettings }) => ({ + vendorsTableSize: vendorsSettings?.tableSize, + })), )(VendorsTable); diff --git a/src/containers/Vendors/VendorsLanding/components.js b/src/containers/Vendors/VendorsLanding/components.js index 35d653930..680c1469c 100644 --- a/src/containers/Vendors/VendorsLanding/components.js +++ b/src/containers/Vendors/VendorsLanding/components.js @@ -10,7 +10,7 @@ import { } from '@blueprintjs/core'; import intl from 'react-intl-universal'; -import { Icon, Money, If } from 'components'; +import { Icon, Money, If, AvaterCell } from 'components'; import { safeCallback, firstLettersArgs } from 'utils'; /** @@ -113,7 +113,7 @@ export function useVendorsTableColumns() { { id: 'avatar', Header: '', - accessor: AvatarAccessor, + Cell: AvaterCell, className: 'avatar', width: 45, disableResizing: true, diff --git a/src/hooks/index.js b/src/hooks/index.js index cc615a214..dbb2944e0 100644 --- a/src/hooks/index.js +++ b/src/hooks/index.js @@ -1,3 +1,4 @@ +import { isEqual } from 'lodash'; import React, { useRef, useEffect, useMemo } from 'react'; import useAsync from './async'; import useAutofocus from './useAutofocus'; @@ -97,7 +98,6 @@ export function useLocalStorage(key, initialValue) { return [storedValue, setValue]; } - export function useMemorizedColumnsWidths(tableName) { const [get, save] = useLocalStorage(`${tableName}.columns_widths`, {}); @@ -105,4 +105,43 @@ export function useMemorizedColumnsWidths(tableName) { save(columnsResizing.columnWidths); }; return [get, save, handleColumnResizing]; -} \ No newline at end of file +} + +// Hook +function usePrevious(value) { + // The ref object is a generic container whose current property is mutable ... + // ... and can hold any value, similar to an instance property on a class + const ref = useRef(); + // Store current value in ref + useEffect(() => { + ref.current = value; + }, [value]); // Only re-run if value changes + // Return previous value (happens before update in useEffect above) + return ref.current; +} + +export function useWhen(condition, callback) { + React.useEffect(() => { + if (condition) { + callback(); + } + }, [condition, callback]); +} + +export function useWhenNot(condition, callback) { + return useWhen(!condition, callback); +} + +export function useWatch(state, callback, props) { + const config = { immediate: false, ...props }; + + const previosuState = usePrevious(state); + const flag = React.useRef(false); + + React.useEffect(() => { + if (!isEqual(previosuState, state) || (config.immediate && !flag.current)) { + flag.current = true; + callback(state); + } + }, [previosuState, state, config.immediate, callback]); +} diff --git a/src/hooks/query/customers.js b/src/hooks/query/customers.js index 630892453..3e397972a 100644 --- a/src/hooks/query/customers.js +++ b/src/hooks/query/customers.js @@ -5,7 +5,7 @@ import useApiRequest from '../useRequest'; import t from './types'; const defaultPagination = { - pageSize: 12, + pageSize: 20, page: 0, pagesCount: 0, }; diff --git a/src/hooks/query/estimates.js b/src/hooks/query/estimates.js index 7b49349d6..26b4ecc63 100644 --- a/src/hooks/query/estimates.js +++ b/src/hooks/query/estimates.js @@ -86,7 +86,7 @@ export function useEstimates(query, props) { estimates: [], pagination: { page: 1, - pageSize: 12, + pageSize: 20, total: 0, }, filterMeta: {}, diff --git a/src/hooks/query/exchangeRates.js b/src/hooks/query/exchangeRates.js index 7f7435d37..7a0cd1efe 100644 --- a/src/hooks/query/exchangeRates.js +++ b/src/hooks/query/exchangeRates.js @@ -5,7 +5,7 @@ import { transformPagination } from 'utils'; import useApiRequest from '../useRequest'; const defaultPagination = { - pageSize: 12, + pageSize: 20, page: 0, pagesCount: 0, }; @@ -82,7 +82,7 @@ export function useExchangeRates(query, props) { exchangesRates: [], pagination: { page: 1, - pageSize: 12, + pageSize: 20, total: 0, }, filterMeta: {}, diff --git a/src/hooks/query/expenses.js b/src/hooks/query/expenses.js index ac5a3a24e..571f31c36 100644 --- a/src/hooks/query/expenses.js +++ b/src/hooks/query/expenses.js @@ -5,7 +5,7 @@ import { transformPagination } from 'utils'; import t from './types'; const defaultPagination = { - pageSize: 12, + pageSize: 20, page: 0, pagesCount: 0, }; diff --git a/src/hooks/query/inventoryAdjustments.js b/src/hooks/query/inventoryAdjustments.js index b5b2f0b08..c2382b821 100644 --- a/src/hooks/query/inventoryAdjustments.js +++ b/src/hooks/query/inventoryAdjustments.js @@ -76,7 +76,7 @@ export function useInventoryAdjustments(query, props) { transactions: [], pagination: { page: 1, - pageSize: 12, + pageSize: 20, total: 0, pagesCount: 0, }, diff --git a/src/hooks/query/invoices.js b/src/hooks/query/invoices.js index 9d639d2a6..e397fd509 100644 --- a/src/hooks/query/invoices.js +++ b/src/hooks/query/invoices.js @@ -110,7 +110,7 @@ export function useInvoices(query, props) { invoices: [], pagination: { page: 1, - pageSize: 12, + pageSize: 20, total: 0, }, filterMeta: {}, diff --git a/src/hooks/query/items.js b/src/hooks/query/items.js index ebff0a27d..aa5c60559 100644 --- a/src/hooks/query/items.js +++ b/src/hooks/query/items.js @@ -5,7 +5,7 @@ import useApiRequest from '../useRequest'; import t from './types'; const DEFAULT_PAGINATION = { - pageSize: 12, + pageSize: 20, page: 0, pagesCount: 0, }; @@ -75,7 +75,7 @@ export function useDeleteItem(props) { /** * Activate the given item. */ - export function useActivateItem(props) { +export function useActivateItem(props) { const queryClient = useQueryClient(); const apiRequest = useApiRequest(); @@ -114,7 +114,9 @@ export function useInactivateItem(props) { const transformItemsResponse = (response) => { return { items: response.data.items, - pagination: transformPagination(transformResponse(response.data.pagination)), + pagination: transformPagination( + transformResponse(response.data.pagination), + ), filterMeta: transformResponse(response.data.filter_meta), }; }; @@ -137,8 +139,8 @@ export function useItems(query, props) { pagination: DEFAULT_PAGINATION, filterMeta: {}, }, - ...props - } + ...props, + }, ); } @@ -149,7 +151,7 @@ export function useRefreshItems() { refresh: () => { queryClient.invalidateQueries(t.ITEMS); }, - } + }; } /** @@ -166,7 +168,7 @@ export function useItem(id, props) { { select: (response) => response.data.item, defaultData: {}, - ...props + ...props, }, ); -} \ No newline at end of file +} diff --git a/src/hooks/query/paymentReceives.js b/src/hooks/query/paymentReceives.js index b206e5a3d..b395ab053 100644 --- a/src/hooks/query/paymentReceives.js +++ b/src/hooks/query/paymentReceives.js @@ -44,7 +44,7 @@ export function usePaymentReceives(query, props) { select: transformPaymentReceives, defaultData: { paymentReceives: [], - pagination: { page: 1, pageSize: 12, total: 0 }, + pagination: { page: 1, pageSize: 20, total: 0 }, filterMeta: {}, }, ...props, diff --git a/src/hooks/state/authentication.js b/src/hooks/state/authentication.js index 6116988b7..8a0afd385 100644 --- a/src/hooks/state/authentication.js +++ b/src/hooks/state/authentication.js @@ -3,11 +3,13 @@ import { useCallback } from 'react'; import { isAuthenticated } from 'store/authentication/authentication.reducer'; import { setLogin, - setStoreReset, } from 'store/authentication/authentication.actions'; import { useQueryClient } from 'react-query'; import { removeCookie } from '../../utils'; +/** + * Removes the authentication cookies. + */ function removeAuthenticationCookies() { removeCookie('token'); removeCookie('organization_id'); diff --git a/src/hooks/state/dashboard.js b/src/hooks/state/dashboard.js index 542fe458b..04c22e37f 100644 --- a/src/hooks/state/dashboard.js +++ b/src/hooks/state/dashboard.js @@ -1,6 +1,10 @@ import { useCallback } from 'react'; import { useDispatch } from 'react-redux'; -import { dashboardPageTitle } from 'store/dashboard/dashboard.actions'; +import { + splashStopLoading, + splashStartLoading, + dashboardPageTitle, +} from '../../store/dashboard/dashboard.actions'; export const useDispatchAction = (action) => { const dispatch = useDispatch(); @@ -17,11 +21,12 @@ export const useDashboardPageTitle = () => { return useDispatchAction(dashboardPageTitle); }; -export const useSetAccountsTableQuery = () => { - +/** + * Splash loading screen actions. + */ +export const useSplashLoading = () => { + return [ + useDispatchAction(splashStartLoading), + useDispatchAction(splashStopLoading), + ]; }; - -export const useAccountsTableQuery = () => { - -} - diff --git a/src/lang/ar/index.json b/src/lang/ar/index.json index 840644b29..a11dcf597 100644 --- a/src/lang/ar/index.json +++ b/src/lang/ar/index.json @@ -443,7 +443,7 @@ "financial_accounting": " محاسبة مالية", "after": "بعد", "before": "قبل", - "count_filters_applied": "تم تطبيق {عدد} من الفلاتر", + "count_filters_applied": "تم تطبيق {count} من الفلاتر", "is": "هو", "is_not": "ليس", "create_a_new_view": "قم بإنشاء طريقة عرض جديدة", @@ -682,7 +682,7 @@ "select_display_name_as": "حدد اسم العرض", "opening_date": "تاريخ الافتتاح", "item_code": "رمز المنتج", - "quantity_on_hand": "كمية في اليد", + "quantity_on_hand": "كمية الحالية", "average_rate": "المعدل المتوسط", "the_name_used_before": "الاسم مستخدم بالفعل.", "the_item_has_associated_transactions": "المنتج له معاملات مرتبطة.", @@ -833,7 +833,7 @@ "the_payment_amount_that_received": "مبلغ الدفع الذي تم استلامه من الزبون أكبر من المبلغ المستحق لهذه الفاتورة.", "invoice_number": "رقم الفاتورة", "make_payment": "قم بالدفع", - "add_payment": "إضافة الدفع", + "add_payment": "إضافة دفع", "quick_receive_payment": "سند قبض سريع", "amount_received": "تم استلام المبلغ", "payment_receive_number_required": "مطلوب رقم استلام الدفعة", @@ -1100,7 +1100,7 @@ "receiving_customer_payments_is_one_pleasant_accounting_tasks": "استلام المدفوعات أحد مهام المحاسبية الأكثر متعة. ستظهر معاملات المدفوعات بمجرد استلام المدفوعات للفواتير.", "estimate_is_used_to_create_bid_proposal_or_quote": "تستخدم العروض لإنشاء عطاء أو اقتراح أو عرض أسعار منتجات. يمكن تحويل العرض إلى أمر مبيعات أو فاتورة.", "payment_made_empty_status_description": "ستظهر معاملات المدفوعات بمجرد سداد فواتير المشتريات.", - "bill_empty_status_description": "", + "bill_empty_status_description": "تسجل المشتريات من الموردين الذين تم او لم يتم الدفع لهم ، لتتبع حساب الذمم الدائنة مع الموردين. ", "invoices_empty_status_description": "فواتير المبيعات للعملاء الذين لا يسددون أي مدفوعات جزئية أو يسددونها ، مع مساعدتك في تتبع الحسابات المستحقة مع الزبائن.", "receipt_empty_status_description": "إيصالات المبيعات للمبيعات التي يدفع فيها الزبون فورًا مقابل المنتجات أو الخدمات في وقت البيع.", "there_were_no_purchases_during_the_selected_date_range": "لا توجد مشتريات خلال النطاق الزمني المحدد.", @@ -1109,10 +1109,7 @@ "filter_": "البحث...", "all_rights_reserved": "© {pre}-{current} كل الحقوق محفوظة.", "congrats_your_account_has_been_created_and_invited": "مبروك! تم إنشاء حسابك ودعوتك إلى {organization_name} بنجاح.", - "while_we_set_up_your_account_please_remember_to_verify_your_account": "أثناء قيامنا بإعداد حسابك ، يرجى تذكر التحقق من حسابك بالنقر فوق الارتباط الذي أرسلناه إلى عنوان بريدك الإلكتروني المسجل", - - "blog": "المدونة", "support": "الدعم النفي", "service_status": "حالة الخدمة", @@ -1248,6 +1245,9 @@ "invoice.details.payment_amount": "مبلغ المدفوع", "expense.details.subtotal": "المجموع", "expense.details.total": "إجمالي", + "manual_journal.details.subtotal": "المجموع", + "manual_journal.details.total": "إجمالي", + "manual_journal.details.description": "الوصف", "setup.left_side.title": "سجل منشأة جديدة الأن.", "setup.left_side.description": "حسابك علي Bigcapital", "setup.left_side.footer_help": "نحن هنا للمساعدة!", @@ -1308,6 +1308,7 @@ "customer.drawer.action.new_payment": "سند زبون جديد", "customer.drawer.action.new_receipt": "إيصال جديد", "customer.drawer.action.new_transaction": "معاملة جديدة", + "customer.drawer.action.edit": "تعديل", "customer.drawer.label.outstanding_receivable": "مستحق القبض", "customer.drawer.label.customer_name": "اسم الزبون", "customer.drawer.label.customer_type": "نوع الزبون", @@ -1333,6 +1334,7 @@ "vendor.drawer.action.new_transaction": "معاملة جديدة", "vendor.drawer.action.new_payment": "سند مورد جديد", "vendor.drawer.action.new_invoice": "فاتورة شراء جديدة", + "vendor.drawer.action.edit": "تعديل", "expenses.empty_status.title": "إضافة وإدارة مصاريف مؤسستك", "expenses.empty_status.description": "قم بإنشاء وإدارة المصروفات التي تُعد جزء من التكاليف التشغيلية لمؤسستك.", "manual_journals.empty_status.title": "قم بإدخال اول القيود اليدوية علي شجرة الحسابات.", @@ -1359,7 +1361,43 @@ "estimate.field.error.estimate_number_required": "رقم العرض حقل مطلوب ، استخدم وضع الزيادة التلقائي أو أدخل يدويًا.", "invoice.field.error.invoice_no_required": "رقم الفاتورة حقل مطلوب ، استخدم وضع الزيادة التلقائي أو أدخل يدويًا.", "payment_receive.field.error.payment_receive_no_required": "رقم سند الدفع حقل مطلوب ، استخدم وضع الزيادة التلقائي أو أدخل يدويًا.", - "receipt.field.error.receipt_number_required": "رقم الإيصال حقل مطلوب ، استخدم وضع الزيادة التلقائي أو أدخل يدويًا." + "receipt.field.error.receipt_number_required": "رقم الإيصال حقل مطلوب ، استخدم وضع الزيادة التلقائي أو أدخل يدويًا.", + "dashboard.rows_height": "ارتفاع الصفوف", + "dashboard.row_small": "صغير", + "dashboard.row_medium": "متوسط", + "filter.select_option": "اختر خيار", + "filter.enter_date": "أدخل تاريخ", + "filter.value": "قيمة", + "payment_made.empty_status.title": "المنشأة لم تدفع اي اموال إلي الموردين ، إلي حد الأن!.", + "estimate.delete.error.estimate_converted_to_invoice":"لا يمكن حذف عملية عرض اسعار الذي تم تحويلها إلي فاتورة بيع.", + "landed_cost.action.delete.success_message": "The landed cost has been deleted successfully.", + + "items.option.only_active": "Only active", + "items.option_all_items.hint": "جميع الاصناف ، بما في ذلك تلك الاصناف لديها رصيد صفر.", + "items.option_with_transactions": "الاصناف مع معاملات", + "items.option_with_transactions.hint": "قم بتضمين الاصناف التي لها معاملات في فترة التاريخ المحددة فقط.", + "items.option_without_zero_balance": "الاصناف ذات رصيد صفر", + "items.option_without_zero_balance.hint": "قم بتضمين الاصناف واستبعاد تلك التي لديها رصيد صفري.", + "items.label_filter_items": "تصفية الاصناف", + + "customers.option_all_customers.hint":"All customers, including that ones have zero-balance.", + "customers.option_without_zero_balance": "Customers without zero-balance", + "customers.option_without_zero_balance.hint":"Include customers and exclude that ones have zero-balance.", + "customers.option_with_transactions": "Customers with transactions", + "customers.option_with_transactions.hint": "Include customers that onces have transactions on the given date period only.", + "customers.label_filter_customers": "Filter customers", + + + "vendors.option_all_vendors.hint":"All vendors, including that ones have zero-balance.", + "vendors.label_filter_vendors": "Filter Vendors", + "vendors.option_without_zero_balance": "Vendors without zero-balance", + "vendors.option_without_zero_balance.hint":"Include vendors and exclude that ones have zero-balance.", + "vendors.option_with_transactions": "Vendors with transactions", + "vendors.option_with_transactions.hint": "Include vendors that onces have transactions on the given date period only." + + + + } diff --git a/src/lang/en/index.json b/src/lang/en/index.json index 88d9fbe27..1ffcc604b 100644 --- a/src/lang/en/index.json +++ b/src/lang/en/index.json @@ -619,7 +619,6 @@ "contact_us_technical_support": "Contact us - Technical Support", "organization_details": "Organization details", "financial_starting_date": "Financial starting date ", - "save_continue": "Save & Continue", "organization_register": "Organization Register", "fiscal_year_": "Fiscal year", @@ -821,7 +820,7 @@ "invoice_date": "Invoice date", "invoice_amount": "Invoice amount", "make_payment": "Make Payment", - "add_payment": "Add Payment", +"add_payment": "Add Payment", "quick_receive_payment": "Quick Receive Payment", "amount_received": "Amount Received", "payment_no": "Payment No.", @@ -1058,7 +1057,6 @@ "products_you_buy_and_or_sell": " Inventory : Products you buy and/or sell and that you track quantities of.", "products_you_buy_and_or_sell_but_don_t_need": " Non-Inventory: Products you buy and/or sell but don’t need to (or can’t) track quantities of, for example, nuts and bolts used in an installation.", "there_is_no_items_in_the_table_yet": "There is no items in the table yet.", - "mr": "Mr.", "mrs": "Mrs.", "ms": "Ms.", @@ -1112,7 +1110,6 @@ "Initializing": "Initializing", "Getting started": "Getting started", "Congratulations": "Congratulations", - "manual_journal_number": "Manual journal {number}", "conditions_and_terms": "Conditions and terms", "allocate_landed_coast": "Allocate landed cost", @@ -1219,6 +1216,8 @@ "bill.details.due_amount": "Due amount", "expense.details.subtotal": "Subtotal", "expense.details.total": "Total", + "manual_journal.details.subtotal": "Subtotal", + "manual_journal.details.total": "Total", "setup.left_side.title": "Register a New Organization now!.", "setup.left_side.description": "You have a Bigcapital account", "setup.left_side.footer_help": "We’re Here to Help!", @@ -1279,6 +1278,7 @@ "customer.drawer.action.new_payment": "New payment", "customer.drawer.action.new_receipt": "New receipt", "customer.drawer.action.new_transaction": "New transaction", + "customer.drawer.action.edit": "Edit", "customer.drawer.label.outstanding_receivable": "Outstanding receivable", "customer.drawer.label.customer_name": "Customer name", "customer.drawer.label.customer_type": "Customer type", @@ -1304,6 +1304,7 @@ "vendor.drawer.action.new_transaction": "New transaction", "vendor.drawer.action.new_payment": "New payment", "vendor.drawer.action.new_invoice": "New purchase invoice", + "vendor.drawer.action.edit": "Edit", "manual_journals.empty_status.description": "Manual journals can be used to record financial transactions manually, used by accountants to work with the ledger.", "manual_journals.empty_status.title": "Create your first journal entries on accounts chart.", "expenses.empty_status.description": "Create and manage expeses that are part of your organization's operating costs.", @@ -1330,5 +1331,33 @@ "estimate.field.error.estimate_number_required": "Estimate number is required, use auto-increment mode or enter manually.", "invoice.field.error.invoice_no_required": "Invoice number is required, use auto-increment mode or enter manually", "payment_receive.field.error.payment_receive_no_required": "Payment receive number is required, use auto-increment mode or enter manually", - "receipt.field.error.receipt_number_required": "Receipt number is required, use auto-increment mode or enter manually" + "receipt.field.error.receipt_number_required": "Receipt number is required, use auto-increment mode or enter manually", + "dashboard.rows_height": "Rows height", + "dashboard.row_small": "Small", + "dashboard.row_medium": "Medium", + "filter.select_option": "Select an option", + "filter.enter_date": "Enter date", + "filter.value": "Value", + "payment_made.empty_status.title": "The organization doesn't pay to vendors, yet!", + "estimate.delete.error.estimate_converted_to_invoice": "Could not delete sale estimate that converted to invoice", + "items.option.only_active": "Only active", + "items.option_all_items.hint": "All items, including that ones have zero-balance.", + "items.option_with_transactions": "Items with transactions", + "items.option_without_zero_balance": "Items without zero-balance", + "items.option_without_zero_balance.hint": "Include items and exclude that ones have zero-balance.", + "items.option_with_transactions.hint": "Include items that onces have transactions on the given date period only.", + "items.label_filter_items": "Filter items", + "customers.option_all_customers.hint": "All customers, including that ones have zero-balance.", + "customers.label_filter_customers": "Filter customers", + "customers.option_without_zero_balance": "Customers without zero-balance", + "customers.option_without_zero_balance.hint": "Include customers and exclude that ones have zero-balance.", + "customers.option_with_transactions": "Customers with transactions", + "customers.option_with_transactions.hint": "Include customers that onces have transactions on the given date period only.", + "vendors.option_all_vendors.hint": "All vendors, including that ones have zero-balance.", + "vendors.label_filter_vendors": "Filter Vendors", + "vendors.option_without_zero_balance": "Vendors without zero-balance", + "vendors.option_without_zero_balance.hint": "Include vendors and exclude that ones have zero-balance.", + "vendors.option_with_transactions": "Vendors with transactions", + "vendors.option_with_transactions.hint": "Include vendors that onces have transactions on the given date period only.", + "landed_cost.action.delete.success_message": "The landed cost has been deleted successfully." } \ No newline at end of file diff --git a/src/static/json/icons.js b/src/static/json/icons.js index d4fce096f..db7c65052 100644 --- a/src/static/json/icons.js +++ b/src/static/json/icons.js @@ -446,25 +446,36 @@ export default { }, 'universal-search': { path: [ - 'M14.386 14.386l4.0877 4.0877-4.0877-4.0877c-2.9418 2.9419-7.7115 2.9419-10.6533 0-2.9419-2.9418-2.9419-7.7115 0-10.6533 2.9418-2.9419 7.7115-2.9419 10.6533 0 2.9419 2.9418 2.9419 7.7115 0 10.6533z' + 'M14.386 14.386l4.0877 4.0877-4.0877-4.0877c-2.9418 2.9419-7.7115 2.9419-10.6533 0-2.9419-2.9418-2.9419-7.7115 0-10.6533 2.9418-2.9419 7.7115-2.9419 10.6533 0 2.9419 2.9418 2.9419 7.7115 0 10.6533z', ], viewBox: '0 0 20 20', }, - "arrow-down-24": { - path: [ - 'M20 12l-1.41-1.41L13 16.17V4h-2v12.17l-5.58-5.59L4 12l8 8 8-8z', - ], + 'arrow-down-24': { + path: ['M20 12l-1.41-1.41L13 16.17V4h-2v12.17l-5.58-5.59L4 12l8 8 8-8z'], viewBox: '0 0 24 24', }, - "arrow-up-24": { - path: [ - 'M4 12l1.41 1.41L11 7.83V20h2V7.83l5.58 5.59L20 12l-8-8-8 8z' - ], + 'arrow-up-24': { + path: ['M4 12l1.41 1.41L11 7.83V20h2V7.83l5.58 5.59L20 12l-8-8-8 8z'], viewBox: '0 0 24 24', }, - "caret-right-16": { + 'caret-right-16': { path: [ - 'M11 8c0-.15-.07-.28-.17-.37l-4-3.5A.495.495 0 006 4.5v7a.495.495 0 00.83.37l4-3.5c.1-.09.17-.22.17-.37z' + 'M11 8c0-.15-.07-.28-.17-.37l-4-3.5A.495.495 0 006 4.5v7a.495.495 0 00.83.37l4-3.5c.1-.09.17-.22.17-.37z', + ], + viewBox: '0 0 16 16', + }, + 'table-row-small': { + path: [ + 'M15,2.5v2a.5.5,0,0,1-.5.5h-13a.5.5,0,0,1-.5-.5v-2A.51.51,0,0,1,1.49,2h13A.5.5,0,0,1,15,2.5Z', + 'M1,7.51A.51.51,0,0,1,1.49,7h13a.51.51,0,0,1,0,1h-13A.51.51,0,0,1,1,7.51Z', + 'M1,10.5a.5.5,0,0,1,.5-.5h13a.5.5,0,0,1,0,1h-13A.5.5,0,0,1,1,10.5Z', + 'M15,13.5a.5.5,0,0,1-.5.51h-13a.51.51,0,0,1,0-1h13A.5.5,0,0,1,15,13.5Z', + ], + viewBox: '0 0 16 16', + }, + 'table-row-medium': { + path: [ + 'M15,3V7a1,1,0,0,1-1,1H2A1,1,0,0,1,1,7V3A1,1,0,0,1,2,2H14A1,1,0,0,1,15,3ZM1.48,11h13a.5.5,0,0,0,0-1h-13a.5.5,0,0,0,0,1Zm13,2h-13a.51.51,0,0,0,0,1h13a.51.51,0,0,0,0-1Z', ], viewBox: '0 0 16 16', }, diff --git a/src/store/Bills/bills.reducer.js b/src/store/Bills/bills.reducer.js index 272f231d2..3311c6c6a 100644 --- a/src/store/Bills/bills.reducer.js +++ b/src/store/Bills/bills.reducer.js @@ -5,7 +5,7 @@ import { createTableStateReducers } from 'store/tableState.reducer'; import t from 'store/types'; export const defaultTableQuery = { - pageSize: 12, + pageSize: 20, pageIndex: 0, filterRoles: [], viewSlug: null, diff --git a/src/store/Estimate/estimates.reducer.js b/src/store/Estimate/estimates.reducer.js index 616e97c8e..bef9b8925 100644 --- a/src/store/Estimate/estimates.reducer.js +++ b/src/store/Estimate/estimates.reducer.js @@ -1,13 +1,11 @@ import { createReducer } from '@reduxjs/toolkit'; import { persistReducer, purgeStoredState } from 'redux-persist'; import storage from 'redux-persist/lib/storage'; -import { - createTableStateReducers, -} from 'store/tableState.reducer'; +import { createTableStateReducers } from 'store/tableState.reducer'; import t from 'store/types'; export const defaultTableQuery = { - pageSize: 12, + pageSize: 20, pageIndex: 0, filterRoles: [], viewSlug: null, @@ -33,7 +31,4 @@ const reducerInstance = createReducer(initialState, { }, }); -export default persistReducer( - CONFIG, - reducerInstance, -); +export default persistReducer(CONFIG, reducerInstance); diff --git a/src/store/ExchangeRate/exchange.reducer.js b/src/store/ExchangeRate/exchange.reducer.js index 3b746a127..857ea7dcc 100644 --- a/src/store/ExchangeRate/exchange.reducer.js +++ b/src/store/ExchangeRate/exchange.reducer.js @@ -3,7 +3,7 @@ import { createTableStateReducers } from 'store/tableState.reducer'; const initialState = { tableState: { - pageSize: 12, + pageSize: 20, pageIndex: 0, }, }; diff --git a/src/store/Invoice/invoices.reducer.js b/src/store/Invoice/invoices.reducer.js index 958815d75..1d7aeec4d 100644 --- a/src/store/Invoice/invoices.reducer.js +++ b/src/store/Invoice/invoices.reducer.js @@ -1,13 +1,11 @@ import { createReducer } from '@reduxjs/toolkit'; import { persistReducer, purgeStoredState } from 'redux-persist'; import storage from 'redux-persist/lib/storage'; -import { - createTableStateReducers, -} from 'store/tableState.reducer'; +import { createTableStateReducers } from 'store/tableState.reducer'; import t from 'store/types'; export const defaultTableQuery = { - pageSize: 12, + pageSize: 20, pageIndex: 0, filterRoles: [], viewSlug: null, @@ -27,13 +25,10 @@ const CONFIG = { const reducerInstance = createReducer(initialState, { ...createTableStateReducers('INVOICES', defaultTableQuery), - + [t.RESET]: () => { purgeStoredState(CONFIG); - } + }, }); -export default persistReducer( - CONFIG, - reducerInstance, -); +export default persistReducer(CONFIG, reducerInstance); diff --git a/src/store/PaymentMades/paymentMades.reducer.js b/src/store/PaymentMades/paymentMades.reducer.js index 98aba95bf..44400c74b 100644 --- a/src/store/PaymentMades/paymentMades.reducer.js +++ b/src/store/PaymentMades/paymentMades.reducer.js @@ -5,7 +5,7 @@ import { createTableStateReducers } from 'store/tableState.reducer'; import t from 'store/types'; export const defaultTableQuery = { - pageSize: 12, + pageSize: 20, pageIndex: 0, filterRoles: [], sortBy: [], diff --git a/src/store/PaymentReceives/paymentReceives.reducer.js b/src/store/PaymentReceives/paymentReceives.reducer.js index ef9fb2c04..0c6dece76 100644 --- a/src/store/PaymentReceives/paymentReceives.reducer.js +++ b/src/store/PaymentReceives/paymentReceives.reducer.js @@ -1,13 +1,11 @@ import { createReducer } from '@reduxjs/toolkit'; import { persistReducer, purgeStoredState } from 'redux-persist'; import storage from 'redux-persist/lib/storage'; -import { - createTableStateReducers, -} from 'store/tableState.reducer'; +import { createTableStateReducers } from 'store/tableState.reducer'; import t from 'store/types'; export const defaultTableQuery = { - pageSize: 12, + pageSize: 20, pageIndex: 0, filterRoles: [], viewSlug: null, @@ -33,7 +31,4 @@ const reducerInstance = createReducer(initialState, { }, }); -export default persistReducer( - CONFIG, - reducerInstance, -); +export default persistReducer(CONFIG, reducerInstance); diff --git a/src/store/accounts/accounts.reducer.js b/src/store/accounts/accounts.reducer.js index 755765a68..b19686f18 100644 --- a/src/store/accounts/accounts.reducer.js +++ b/src/store/accounts/accounts.reducer.js @@ -4,9 +4,8 @@ import storage from 'redux-persist/lib/storage'; import { createTableStateReducers } from 'store/tableState.reducer'; import t from 'store/types'; - -export const defaultTableQuery = { - pageSize: 12, +export const defaultTableQuery = { + pageSize: 20, pageIndex: 0, filterRoles: [], }; @@ -28,7 +27,7 @@ const reducerInstance = createReducer(initialState, { [t.RESET]: () => { purgeStoredState(CONFIG); - } + }, }); export default persistReducer(CONFIG, reducerInstance); diff --git a/src/store/customers/customers.reducer.js b/src/store/customers/customers.reducer.js index 3b48816a7..4a1f14c33 100644 --- a/src/store/customers/customers.reducer.js +++ b/src/store/customers/customers.reducer.js @@ -5,7 +5,7 @@ import { createTableStateReducers } from 'store/tableState.reducer'; // Default table query state. export const defaultTableQueryState = { - pageSize: 12, + pageSize: 20, pageIndex: 0, inactiveMode: false, filterRoles: [], diff --git a/src/store/dashboard/dashboard.actions.js b/src/store/dashboard/dashboard.actions.js index f7df3e671..d1ef01274 100644 --- a/src/store/dashboard/dashboard.actions.js +++ b/src/store/dashboard/dashboard.actions.js @@ -84,4 +84,22 @@ export function appIntlIsLoading(toggle) { type: t.APP_INTL_IS_LOADING, payload: { isLoading: toggle }, }; +} + +/** + * Splash start loading. + */ +export function splashStartLoading() { + return { + type: t.SPLASH_START_LOADING, + }; +} + +/** + * Splash stop loading. + */ +export function splashStopLoading() { + return { + type: t.SPLASH_STOP_LOADING, + } } \ No newline at end of file diff --git a/src/store/dashboard/dashboard.reducer.js b/src/store/dashboard/dashboard.reducer.js index 2107975fa..4108cf3af 100644 --- a/src/store/dashboard/dashboard.reducer.js +++ b/src/store/dashboard/dashboard.reducer.js @@ -1,5 +1,5 @@ import { createReducer } from '@reduxjs/toolkit'; -import { isUndefined } from 'lodash'; +import { isUndefined, isNumber } from 'lodash'; import t from 'store/types'; import { persistReducer, purgeStoredState } from 'redux-persist'; import storage from 'redux-persist/lib/storage'; @@ -16,6 +16,7 @@ const initialState = { topbarEditViewId: null, requestsLoading: 0, backLink: false, + splashScreenLoading: null, appIsLoading: true, appIntlIsLoading: true, }; @@ -102,14 +103,17 @@ const reducerInstance = createReducer(initialState, { state.backLink = backLink; }, - [t.APP_IS_LOADING]: (state, action) => { - const { isLoading } = action.payload; - state.appIsLoading = isLoading; + [t.SPLASH_START_LOADING]: (state) => { + if (isNumber(state.splashScreenLoading)) { + state.splashScreenLoading += 1; + } else { + state.splashScreenLoading = 1; + } }, - [t.APP_INTL_IS_LOADING]: (state, action) => { - const { isLoading } = action.payload; - state.appIntlIsLoading = isLoading; + [t.SPLASH_STOP_LOADING]: (state) => { + state.splashScreenLoading -= 1; + state.splashScreenLoading = Math.max(state.splashScreenLoading, 0); }, [t.RESET]: () => { diff --git a/src/store/dashboard/dashboard.types.js b/src/store/dashboard/dashboard.types.js index cc8885a30..d63cddd01 100644 --- a/src/store/dashboard/dashboard.types.js +++ b/src/store/dashboard/dashboard.types.js @@ -14,6 +14,6 @@ export default { SET_TOPBAR_EDIT_VIEW: 'SET_TOPBAR_EDIT_VIEW', SIDEBAR_EXPEND_TOGGLE: 'SIDEBAR_EXPEND_TOGGLE', SET_DASHBOARD_BACK_LINK: 'SET_DASHBOARD_BACK_LINK', - APP_IS_LOADING: 'APP_IS_LOADING', - APP_INTL_IS_LOADING: 'APP_INTL_IS_LOADING' + SPLASH_START_LOADING: 'SPLASH_START_LOADING', + SPLASH_STOP_LOADING: 'SPLASH_STOP_LOADING', }; diff --git a/src/store/expenses/expenses.reducer.js b/src/store/expenses/expenses.reducer.js index 9cbc6a8da..e377d0010 100644 --- a/src/store/expenses/expenses.reducer.js +++ b/src/store/expenses/expenses.reducer.js @@ -6,7 +6,7 @@ import t from 'store/types'; // Default table query. export const defaultTableQuery = { - pageSize: 12, + pageSize: 20, pageIndex: 0, filterRoles: [], viewSlug: null, @@ -30,7 +30,7 @@ const reducerInstance = createReducer(initialState, { [t.RESET]: () => { purgeStoredState(CONFIG); - } + }, }); export default persistReducer(CONFIG, reducerInstance); diff --git a/src/store/inventoryAdjustments/inventoryAdjustment.reducer.js b/src/store/inventoryAdjustments/inventoryAdjustment.reducer.js index 15e673224..8545cfcb7 100644 --- a/src/store/inventoryAdjustments/inventoryAdjustment.reducer.js +++ b/src/store/inventoryAdjustments/inventoryAdjustment.reducer.js @@ -6,7 +6,7 @@ import t from 'store/types'; const initialState = { tableState: { - pageSize: 12, + pageSize: 20, pageIndex: 0, sortBy: [], }, diff --git a/src/store/items/items.reducer.js b/src/store/items/items.reducer.js index fb4c3bce9..e28d44a93 100644 --- a/src/store/items/items.reducer.js +++ b/src/store/items/items.reducer.js @@ -5,7 +5,7 @@ import { createTableStateReducers } from 'store/tableState.reducer'; import t from 'store/types'; export const defaultTableQuery = { - pageSize: 12, + pageSize: 20, pageIndex: 0, filterRoles: [], inactiveMode: false, diff --git a/src/store/manualJournals/manualJournals.reducers.js b/src/store/manualJournals/manualJournals.reducers.js index 279ccf3ef..9d44bd1b5 100644 --- a/src/store/manualJournals/manualJournals.reducers.js +++ b/src/store/manualJournals/manualJournals.reducers.js @@ -5,11 +5,11 @@ import { createTableStateReducers } from 'store/tableState.reducer'; import t from 'store/types'; export const defaultTableQuery = { - pageSize: 12, + pageSize: 20, pageIndex: 0, filterRoles: [], viewSlug: null, -} +}; const initialState = { tableState: defaultTableQuery, diff --git a/src/store/receipts/receipts.reducer.js b/src/store/receipts/receipts.reducer.js index 98029f7fe..5ac82ec3f 100644 --- a/src/store/receipts/receipts.reducer.js +++ b/src/store/receipts/receipts.reducer.js @@ -5,7 +5,7 @@ import { createTableStateReducers } from 'store/tableState.reducer'; import t from 'store/types'; export const defaultTableQuery = { - pageSize: 12, + pageSize: 20, pageIndex: 0, filterRoles: [], viewSlug: null, diff --git a/src/store/settings/settings.actions.js b/src/store/settings/settings.actions.js index 3eea4aefa..11c20c4eb 100644 --- a/src/store/settings/settings.actions.js +++ b/src/store/settings/settings.actions.js @@ -36,4 +36,11 @@ export const setSettings = (settings) => { type: t.SETTING_SET, options: settings, }; +} + +export const addSettings = (group, key, value) => { + return { + type: t.SETTING_ADD, + payload: { group, key, value } + }; } \ No newline at end of file diff --git a/src/store/settings/settings.reducer.js b/src/store/settings/settings.reducer.js index 3b25af410..54962940b 100644 --- a/src/store/settings/settings.reducer.js +++ b/src/store/settings/settings.reducer.js @@ -1,5 +1,8 @@ import { camelCase } from 'lodash'; import { createReducer } from '@reduxjs/toolkit'; +import storage from 'redux-persist/lib/storage'; +import { persistReducer, purgeStoredState } from 'redux-persist'; + import t from 'store/types'; const initialState = { @@ -7,14 +10,54 @@ const initialState = { organization: { name: 'Bigcapital, LLC', }, - manualJournals: {}, - bills: {}, - billPayments: {}, - salesEstimates: {}, + manualJournals: { + tableSize: 'medium', + }, + bills: { + tableSize: 'medium', + }, + billPayments: { + tableSize: 'medium', + }, + paymentReceives: { + tableSize: 'medium', + }, + salesEstimates: { + tableSize: 'medium', + }, + items: { + tableSize: 'medium', + }, + salesInvoices: { + tableSize: 'medium', + }, + salesReceipts: { + tableSize: 'medium', + }, + expenses: { + tableSize: 'medium', + }, + customers: { + tableSize: 'medium', + }, + vendors: { + tableSize: 'medium', + }, + accounts: { + tableSize: 'medium' + } }, }; -export default createReducer(initialState, { +const STORAGE_KEY = 'bigcapital:settings'; + +const PRESIST_CONFIG = { + key: STORAGE_KEY, + whitelist: ['data'], + storage, +}; + +const reducerInstance = createReducer(initialState, { [t.SETTING_SET]: (state, action) => { const { options } = action; const _data = { @@ -32,4 +75,19 @@ export default createReducer(initialState, { }); state.data = _data; }, + + [t.SETTING_ADD]: (state, action) => { + const { group, key, value } = action.payload; + + const newData = { + ...state.data, + [group]: { + ...state.data[group], + [key]: value, + }, + }; + state.data = newData; + }, }); + +export default persistReducer(PRESIST_CONFIG, reducerInstance); diff --git a/src/store/settings/settings.type.js b/src/store/settings/settings.type.js index fac8d63a5..50226c5d2 100644 --- a/src/store/settings/settings.type.js +++ b/src/store/settings/settings.type.js @@ -2,4 +2,5 @@ export default { SETTING_LIST_SET: 'SETTING_LIST_SET', CLEAR_OPTIONS_FORM_ERRORS: 'CLEAR_OPTIONS_FORM_ERRORS', SETTING_SET: 'SETTING_SET', + SETTING_ADD: 'SETTING_ADD', }; diff --git a/src/store/vendors/vendors.reducer.js b/src/store/vendors/vendors.reducer.js index 0f1fe726e..76c895bb8 100644 --- a/src/store/vendors/vendors.reducer.js +++ b/src/store/vendors/vendors.reducer.js @@ -5,7 +5,7 @@ import { createTableStateReducers } from 'store/tableState.reducer'; import t from 'store/types'; export const defaultTableQueryState = { - pageSize: 12, + pageSize: 20, pageIndex: 0, inactiveMode: false, filterRoles: [], diff --git a/src/style/components/DataTable/DataTable.scss b/src/style/components/DataTable/DataTable.scss index 36bd7f5a9..a62a54dbe 100644 --- a/src/style/components/DataTable/DataTable.scss +++ b/src/style/components/DataTable/DataTable.scss @@ -10,6 +10,7 @@ } } } + .table { text-align: left; border-spacing: 0; @@ -17,8 +18,9 @@ display: block; .thead { - overflow-y: auto; - overflow-x: hidden; + overflow: hidden; + // overflow-y: auto; + // overflow-x: hidden; .th { padding: 0.7rem 0.5rem; @@ -28,12 +30,13 @@ font-weight: 600; border-bottom: 1px solid rgb(224, 224, 224); - > div{ + >div { overflow: hidden; white-space: nowrap; text-overflow: ellipsis; } } + .sort-icon { width: 0; height: 0; @@ -47,6 +50,7 @@ border-right: 4px solid transparent; border-bottom: 6px solid #666; } + &--asc { border-left: 4px solid transparent; border-right: 4px solid transparent; @@ -65,16 +69,16 @@ } } - .bp3-context-menu-popover-target{ + .bp3-context-menu-popover-target { z-index: 100; } - .tr-context{ + .tr-context { display: flex; flex: 1 0 auto; } - &:hover .td.clickable{ + &:hover .td.clickable { cursor: pointer; } } @@ -89,7 +93,7 @@ margin: 0; padding: 0.5rem; - .cell-inner{ + .cell-inner { flex: 1 0 0; } @@ -100,6 +104,7 @@ .bp3-control { margin-bottom: 0; } + .resizer { display: inline-block; background: transparent; @@ -115,7 +120,7 @@ .inner-resizer { height: 100%; width: 1px; - border-left: 1px solid #E6E6E6; + border-left: 1px solid #e6e6e6; margin: 0 auto; } @@ -126,6 +131,7 @@ .bp3-control.bp3-checkbox .bp3-control-indicator { border: 1px solid #c2c2c2; + cursor: auto; &, &:hover { @@ -135,17 +141,18 @@ } .bp3-control.bp3-checkbox { - input:checked ~ .bp3-control-indicator, - input:indeterminate ~ .bp3-control-indicator { + + input:checked~.bp3-control-indicator, + input:indeterminate~.bp3-control-indicator { border-color: #0052ff; } } - .skeleton{ - animation: skeleton-fade-in .3s linear forwards, + .skeleton { + animation: skeleton-fade-in 0.3s linear forwards, skeleton-glow 1s linear infinite alternate; - animation-delay: 0s,.3s; + animation-delay: 0s, 0.3s; height: 8px; opacity: 1; width: 65%; @@ -153,8 +160,8 @@ } } - .th{ - .skeleton{ + .th { + .skeleton { margin: 5px 0; } } @@ -164,7 +171,7 @@ overflow: auto; .tbody-inner { - > .loading { + >.loading { padding-top: 40px; } } @@ -177,7 +184,8 @@ .placeholder { color: #a0a0a0; } - .text-overview{ + + .text-overview { overflow: hidden; white-space: nowrap; text-overflow: ellipsis; @@ -188,18 +196,21 @@ } &.is-text-overview { - .expend-padding{ + .expend-padding { display: flex; width: 100%; } } } + .tr:hover .td { background: #f3f7fc; } + .tr.is-context-menu-active .td { background: #f3fafc; } + .td.actions .#{$ns}-button { background: #e6effb; border: 0; @@ -211,15 +222,17 @@ &:focus { background-color: #cfdcee; } + svg { color: #425361; } + .bp3-icon-more-h-16 { margin-top: 2px; } } + .tr.no-results { - .td { flex-direction: column; padding: 18px 20px; @@ -228,13 +241,13 @@ font-size: 14px; border-bottom: 0; - &:hover{ + &:hover { background: transparent; } } } - > .loading { + >.loading { padding-top: 50px; } } @@ -242,37 +255,56 @@ .tr .th, .tr .td { .expand-toggle { - cursor: pointer; + cursor: auto; display: inline-block; - padding: 0 8px 0 0; + padding: 4px 8px; padding-left: 0; margin: auto 0; margin-left: 4px; + vertical-align: top; - .arrow-right { + .expand-arrow { width: 0; height: 0; border-top: 5px solid transparent; border-bottom: 5px solid transparent; border-left: 8px solid #acacac; display: block; + transition: all 0.1s cubic-bezier(.4, 1, .75, .9); + + &.is-expanded { + transform: rotate(90deg); + } } - .arrow-down { - width: 0; - height: 0; - border-left: 5px solid transparent; - border-right: 5px solid transparent; - border-top: 8px solid #acacac; - display: block; + &:hover { + .expand-arrow { + border-left-color: #7d8593; + } } } } - .tr-inner{ + .tr-inner { display: flex; width: 100%; } + + &-size { + + &--medium { + .tbody .tr { + background-size: red; + min-height: 46px; + } + } + + &--small { + .tbody .tr { + min-height: 40px; + } + } + } } .no-results { @@ -294,6 +326,7 @@ } &.has-sticky { + .thead, .tfoot { position: sticky; @@ -307,6 +340,7 @@ .tfoot { bottom: 0; } + .tbody { position: relative; z-index: 0; @@ -332,14 +366,14 @@ } } - - .ReactVirtualized__Grid{ + .ReactVirtualized__Grid { will-change: auto !important; } + + + } - - .table-constrant { .table { .thead .th { diff --git a/src/style/components/Drawers/InventoryAdjustmentDrawer.module.scss b/src/style/components/Drawers/InventoryAdjustmentDrawer.module.scss index 52706bbfb..211c2f9ba 100644 --- a/src/style/components/Drawers/InventoryAdjustmentDrawer.module.scss +++ b/src/style/components/Drawers/InventoryAdjustmentDrawer.module.scss @@ -1,6 +1,7 @@ .detail_panel { :global .card { padding: 22px 15px; + margin: 15px; } &_header { @@ -9,6 +10,7 @@ &_table { :global .bigcapital-datatable { + margin-top: 30px; .thead, .tbody { .quantity, diff --git a/src/style/components/UniversalSearch.scss b/src/style/components/UniversalSearch.scss index 2ee0a989d..01aaa5fe5 100644 --- a/src/style/components/UniversalSearch.scss +++ b/src/style/components/UniversalSearch.scss @@ -4,10 +4,8 @@ opacity: 1; background-color: #fff; border-radius: 3px; - box-shadow: - 0 0 0 1px rgba(16, 22, 26, .1), - 0 4px 8px rgba(16, 22, 26, .2), - 0 18px 46px 6px rgba(16, 22, 26, .2); + box-shadow: 0 0 0 1px rgba(16, 22, 26, 0.1), 0 4px 8px rgba(16, 22, 26, 0.2), + 0 18px 46px 6px rgba(16, 22, 26, 0.2); left: calc(50% - 250px); top: 20vh; width: 500px; @@ -16,7 +14,7 @@ &.bp3-overlay-appear, &.bp3-overlay-enter { filter: blur(20px); - opacity: .2 + opacity: 0.2; } &.bp3-overlay-appear-active, @@ -24,31 +22,28 @@ filter: blur(0); opacity: 1; transition-delay: 0; - transition-duration: .2s; + transition-duration: 0.2s; transition-property: filter, opacity; - transition-timing-function: cubic-bezier(.4, 1, .75, .9) + transition-timing-function: cubic-bezier(0.4, 1, 0.75, 0.9); } &.bp3-overlay-exit { filter: blur(0); - opacity: 1 + opacity: 1; } &.bp3-overlay-exit-active { filter: blur(20px); - opacity: .2; + opacity: 0.2; transition-delay: 0; - transition-duration: .2s; + transition-duration: 0.2s; transition-property: filter, opacity; - transition-timing-function: cubic-bezier(.4, 1, .75, .9) + transition-timing-function: cubic-bezier(0.4, 1, 0.75, 0.9); } &__omnibar { - .bp3-input-group { - .bp3-icon { - svg { stroke: currentColor; fill: none; @@ -59,7 +54,6 @@ } } - .bp3-input-group .bp3-input { border: 0; box-shadow: 0 0 0 0; @@ -69,13 +63,13 @@ } .bp3-input-group.bp3-large .bp3-input:not(:first-child) { - padding-left: 50px; + padding-left: 50px !important; + } + .bp3-input-group.bp3-large .bp3-input:not(:last-child) { + padding-right: 130px !important; } - .bp3-input {} - .bp3-input-group { - .bp3-icon { margin: 16px; color: #5c707f; @@ -100,13 +94,12 @@ color: #8499a7; } } - &.bp3-intent-primary{ - - &.bp3-active{ - background-color: rgb(235, 241, 246); + &.bp3-intent-primary { + &.bp3-active { + background-color: rgb(235, 241, 246); color: #252b30; - .bp3-menu-item-label{ + .bp3-menu-item-label { color: #5c7080; } } @@ -125,11 +118,9 @@ flex-direction: row; align-items: center; } - } &__type-select-overlay { - .bp3-button { margin: 0 !important; } @@ -145,7 +136,6 @@ } &__action { - &:not(:first-of-type) { margin-left: 14px; } @@ -155,7 +145,6 @@ } &--arrows { - .bp3-tag { padding: 0; text-align: center; @@ -177,8 +166,8 @@ } } - &__footer {} - + &__footer { + } &-input-right-elements { display: flex; @@ -194,7 +183,6 @@ &--estimate, &--bill, &--receipt { - .amount { color: #252b30; } @@ -216,4 +204,4 @@ .universal-search-overlay .bp3-overlay-backdrop { background: rgba(0, 10, 30, 0.3); -} \ No newline at end of file +} diff --git a/src/style/pages/Accounts/List.scss b/src/style/pages/Accounts/List.scss index 97665f457..314dec53b 100644 --- a/src/style/pages/Accounts/List.scss +++ b/src/style/pages/Accounts/List.scss @@ -34,7 +34,7 @@ border-radius: 8px; } } - .account-desc{ + .account-desc { font-size: 11px; color: hsl(0, 0%, 50%); margin-top: 2px; @@ -57,5 +57,15 @@ } } } + .table-size--small { + .tbody .tr { + .normal { + svg { + width: 14px; + height: 14px; + } + } + } + } } } diff --git a/src/style/pages/Bills/List.scss b/src/style/pages/Bills/List.scss index 38fb79e66..2fcb700cb 100644 --- a/src/style/pages/Bills/List.scss +++ b/src/style/pages/Bills/List.scss @@ -1,9 +1,6 @@ .dashboard__insider--bills { .bigcapital-datatable { .tbody { - .tr { - min-height: 46px; - } .td.amount { .cell-inner { > span { diff --git a/src/style/pages/Customers/List.scss b/src/style/pages/Customers/List.scss index a12f9e3b4..57ceabc3c 100644 --- a/src/style/pages/Customers/List.scss +++ b/src/style/pages/Customers/List.scss @@ -1,27 +1,33 @@ +.dashboard__insider--customers-list { + .bigcapital-datatable { + .tbody { + .tr .td { + padding-top: 0.5rem; + padding-bottom: 0.5rem; + } + .avatar.td { + .avatar { + display: inline-block; + background: #adbcc9; + border-radius: 50%; + text-align: center; + font-weight: 400; + color: #fff; -.dashboard__insider--customers-list{ - - .bigcapital-datatable{ - - .tr .td{ - padding-top: 0.5rem; - padding-bottom: 0.5rem; - } - - .avatar.td{ - - .avatar{ - height: 30px; - width: 30px; - display: inline-block; - background: #adbcc9; - border-radius: 50%; - line-height: 30px; - text-align: center; - font-weight: 400; - font-size: 14px; - color: #fff; + &[data-size='medium'] { + height: 30px; + width: 30px; + line-height: 30px; + font-size: 14px; + } + &[data-size='small'] { + height: 25px; + width: 25px; + line-height: 25px; + font-size: 12px; + } + } } } } diff --git a/src/style/pages/Expense/List.scss b/src/style/pages/Expense/List.scss index e6471c90b..f8b29100c 100644 --- a/src/style/pages/Expense/List.scss +++ b/src/style/pages/Expense/List.scss @@ -5,10 +5,6 @@ .bigcapital-datatable { .table { .tbody { - - .tr{ - min-height: 46px; - } .td.amount { span { font-weight: 600; @@ -17,4 +13,4 @@ } } } -} \ No newline at end of file +} diff --git a/src/style/pages/FinancialStatements/ContactsBalanceSummary.scss b/src/style/pages/FinancialStatements/ContactsBalanceSummary.scss index a9d63287b..5a2ce5c5e 100644 --- a/src/style/pages/FinancialStatements/ContactsBalanceSummary.scss +++ b/src/style/pages/FinancialStatements/ContactsBalanceSummary.scss @@ -32,7 +32,8 @@ .financial-statement--balance-summary { .financial-header-drawer { .bp3-drawer { - max-height: 350px; + // max-height: 350px; + max-height: 415px; } } } diff --git a/src/style/pages/FinancialStatements/ContactsTransactions.scss b/src/style/pages/FinancialStatements/ContactsTransactions.scss index 6a5f293b3..74774d49e 100644 --- a/src/style/pages/FinancialStatements/ContactsTransactions.scss +++ b/src/style/pages/FinancialStatements/ContactsTransactions.scss @@ -84,7 +84,8 @@ .financial-statement--transactions { .financial-header-drawer { .bp3-drawer { - max-height: 350px; + // max-height: 350px; + max-height: 415px; } } } diff --git a/src/style/pages/FinancialStatements/SalesAndPurchasesSheet.scss b/src/style/pages/FinancialStatements/SalesAndPurchasesSheet.scss index f3a0976a1..9e1c57d46 100644 --- a/src/style/pages/FinancialStatements/SalesAndPurchasesSheet.scss +++ b/src/style/pages/FinancialStatements/SalesAndPurchasesSheet.scss @@ -19,7 +19,7 @@ padding-bottom: 0.4rem; } .tr.row_type--total .td { - border-top: 1px solid #BBB; + border-top: 1px solid #bbb; font-weight: 500; border-bottom: 3px double #000; } @@ -29,21 +29,19 @@ } .financial-statement--sales-by-items, -.financial-statement--purchases-by-items{ - - .financial-header-drawer{ - .bp3-drawer{ - max-height: 400px; +.financial-statement--purchases-by-items { + .financial-header-drawer { + .bp3-drawer { + // max-height: 400px; + max-height: 415px; } } } - -.financial-statement--inventory-valuation{ - - .financial-header-drawer{ - .bp3-drawer{ +.financial-statement--inventory-valuation { + .financial-header-drawer { + .bp3-drawer { max-height: 350px; } } -} \ No newline at end of file +} diff --git a/src/style/pages/Items/List.scss b/src/style/pages/Items/List.scss index df1a9e76e..5be7f2fed 100644 --- a/src/style/pages/Items/List.scss +++ b/src/style/pages/Items/List.scss @@ -6,9 +6,6 @@ .bigcapital-datatable { .table { .tbody { - .tr{ - min-height: 46px; - } .item_type.td { .bp3-tag { font-size: 13px; diff --git a/src/style/pages/ManualJournal/List.scss b/src/style/pages/ManualJournal/List.scss index 3dff76dab..df30f4d0f 100644 --- a/src/style/pages/ManualJournal/List.scss +++ b/src/style/pages/ManualJournal/List.scss @@ -4,9 +4,9 @@ } .tbody { - .tr .td{ - padding: 0.8rem 0.5rem; - } + // .tr .td{ + // padding: 0.8rem 0.5rem; + // } .td.amount { .bp3-popover-target { border-bottom: 1px solid #e7e7e7; diff --git a/src/style/pages/PaymentMade/List.scss b/src/style/pages/PaymentMade/List.scss index e3e41df3c..27e9f34be 100644 --- a/src/style/pages/PaymentMade/List.scss +++ b/src/style/pages/PaymentMade/List.scss @@ -1,21 +1,13 @@ - -.dashboard__insider--payment-mades-list{ - - .bigcapital-datatable{ - - .tbody{ - .tr{ - min-height: 46px; - } - +.dashboard__insider--payment-mades-list { + .bigcapital-datatable { + .tbody { .td.amount { - - .cell-inner{ - > span{ + .cell-inner { + > span { font-weight: 600; } } } } } -} \ No newline at end of file +} diff --git a/src/style/pages/PaymentReceive/List.scss b/src/style/pages/PaymentReceive/List.scss index 89d1bf4b3..4fc92a04a 100644 --- a/src/style/pages/PaymentReceive/List.scss +++ b/src/style/pages/PaymentReceive/List.scss @@ -1,21 +1,13 @@ - -.dashboard__insider--payment-receives-list{ - - .bigcapital-datatable{ - - .tbody{ - .tr .td{ - min-height: 46px; - } - +.dashboard__insider--payment-receives-list { + .bigcapital-datatable { + .tbody { .td.amount { - - .cell-inner{ - > span{ + .cell-inner { + > span { font-weight: 600; } } } } } -} \ No newline at end of file +} diff --git a/src/style/pages/SaleEstimate/List.scss b/src/style/pages/SaleEstimate/List.scss index 02e7d738b..434894ba4 100644 --- a/src/style/pages/SaleEstimate/List.scss +++ b/src/style/pages/SaleEstimate/List.scss @@ -1,26 +1,13 @@ - -.dashboard__insider--sale_estimate{ - - .bigcapital-datatable{ - - .tbody{ - .tr{ - min-height: 46px; - } - - .tr .td{ - padding-top: 0.88rem; - padding-bottom: 0.88rem; - } - +.dashboard__insider--sale_estimate { + .bigcapital-datatable { + .tbody { .td.amount { - - .cell-inner{ - > span{ + .cell-inner { + > span { font-weight: 600; } } } } } -} \ No newline at end of file +} diff --git a/src/style/pages/SaleInvoice/List.scss b/src/style/pages/SaleInvoice/List.scss index 68fcd4b6e..adb06f1e7 100644 --- a/src/style/pages/SaleInvoice/List.scss +++ b/src/style/pages/SaleInvoice/List.scss @@ -1,46 +1,38 @@ - - -.dashboard__insider--sales-invoices-list{ - - .bigcapital-datatable{ - .tbody{ - .tr{ - min-height: 46px; - } - .balance.td{ - - .cell-inner{ - > span{ +.dashboard__insider--sales-invoices-list { + .bigcapital-datatable { + .tbody { + .balance.td { + .cell-inner { + > span { font-weight: 600; } } } - .status.td{ - + .status.td { .overdue-status, - .due-status{ + .due-status { display: block; font-size: 13.5px; line-height: 1.4; - + .partial-paid{ + + .partial-paid { margin-top: 2px; } } - .overdue-status{ + .overdue-status { color: #ec5b0a; } - .due-status{ + .due-status { color: #1652c8; } - .partial-paid{ + .partial-paid { font-size: 12px; line-height: 1; display: block; margin-bottom: 6px; opacity: 0.7; } - .fully-paid-icon{ + .fully-paid-icon { width: 18px; height: 18px; margin-right: 8px; @@ -49,19 +41,26 @@ fill: #2ba01d; } } - .fully-paid-text{ + .fully-paid-text { font-size: 13.5px; } - .bp3-progress-bar{ + .bp3-progress-bar { height: 4px; max-width: 180px; - + &, - .bp3-progress-meter{ + .bp3-progress-meter { border-radius: 0; } } } } + .table-size--small { + .status.td { + .bp3-progress-bar { + height: 3px; + } + } + } } -} \ No newline at end of file +} diff --git a/src/style/pages/SaleReceipt/List.scss b/src/style/pages/SaleReceipt/List.scss index b246a5a9f..7522241ef 100644 --- a/src/style/pages/SaleReceipt/List.scss +++ b/src/style/pages/SaleReceipt/List.scss @@ -1,21 +1,13 @@ - -.dashboard__insider--sales_receipts{ - - .bigcapital-datatable{ - - .tbody{ - .tr{ - min-height: 46px; - } - +.dashboard__insider--sales_receipts { + .bigcapital-datatable { + .tbody { .td.amount { - - .cell-inner{ - > span{ + .cell-inner { + > span { font-weight: 600; } } } } } -} \ No newline at end of file +} diff --git a/src/style/pages/Vendors/List.scss b/src/style/pages/Vendors/List.scss index ef592ef98..f71bc5eeb 100644 --- a/src/style/pages/Vendors/List.scss +++ b/src/style/pages/Vendors/List.scss @@ -1,28 +1,34 @@ .dashboard__insider--vendors-list { - - .bigcapital-datatable { - - tbody { - .tr .td { - padding-top: 0.5rem; - padding-bottom: 0.5rem; - } - } - - .avatar.td { - - .avatar { - height: 30px; - width: 30px; - display: inline-block; - background: #adbcc9; - border-radius: 50%; - line-height: 30px; - text-align: center; - font-weight: 400; - font-size: 14px; - color: #fff; - } - } + .bigcapital-datatable { + tbody { + .tr .td { + padding-top: 0.5rem; + padding-bottom: 0.5rem; + } } -} \ No newline at end of file + + .avatar.td { + .avatar { + display: inline-block; + background: #adbcc9; + border-radius: 50%; + text-align: center; + font-weight: 400; + color: #fff; + + &[data-size='medium'] { + height: 30px; + width: 30px; + line-height: 30px; + font-size: 14px; + } + &[data-size='small'] { + height: 25px; + width: 25px; + line-height: 25px; + font-size: 12px; + } + } + } + } +} diff --git a/src/utils.js b/src/utils.js index c6ce0c12b..18f519b49 100644 --- a/src/utils.js +++ b/src/utils.js @@ -891,3 +891,12 @@ export function flatten(target, opts) { return output; } + +/** + * Ingores the given selectors from event callback. + */ +export function ignoreEventFromSelectors(event, selectors) { + return selectors + .map((selector) => event.target.closest(selector)) + .some((element) => !!element); +}