diff --git a/src/components/Forms/FormikObserver.js b/src/components/Forms/FormikObserver.js index a93b06864..c9e3a3270 100644 --- a/src/components/Forms/FormikObserver.js +++ b/src/components/Forms/FormikObserver.js @@ -1,7 +1,9 @@ - +import { useFormikContext } from 'formik'; import { useDeepCompareEffect } from 'hooks/utils'; -export function FormikObserver({ onChange, values }) { +export function FormikObserver({ onChange }) { + const { values } = useFormikContext(); + useDeepCompareEffect(() => { onChange(values); }, [values]); diff --git a/src/containers/Accounting/MakeJournal/MakeJournalEntriesTable.js b/src/containers/Accounting/MakeJournal/MakeJournalEntriesTable.js index e34c299f9..2069ffdbc 100644 --- a/src/containers/Accounting/MakeJournal/MakeJournalEntriesTable.js +++ b/src/containers/Accounting/MakeJournal/MakeJournalEntriesTable.js @@ -63,7 +63,6 @@ export default function MakeJournalEntriesTable({ data={entries} sticky={true} totalRow={true} - footer={true} payload={{ accounts, errors: error, diff --git a/src/containers/Accounting/MakeJournal/components.js b/src/containers/Accounting/MakeJournal/components.js index c82383426..4354ef57d 100644 --- a/src/containers/Accounting/MakeJournal/components.js +++ b/src/containers/Accounting/MakeJournal/components.js @@ -1,8 +1,7 @@ import React from 'react'; import { Intent, Position, Button, Tooltip } from '@blueprintjs/core'; -import { FormattedMessage as T } from 'components'; -import { Icon, Money, Hint } from 'components'; import intl from 'react-intl-universal'; +import { Icon, Hint, FormattedMessage as T } from 'components'; import { AccountsListFieldCell, MoneyFieldCell, @@ -10,7 +9,6 @@ import { ContactsListFieldCell, BranchesListFieldCell, } from 'components/DataTableCells'; -import { safeSumBy } from 'utils'; import { useFeatureCan } from 'hooks/state'; import { Features } from 'common'; @@ -43,38 +41,6 @@ export function DebitHeaderCell({ payload: { currencyCode } }) { return intl.get('debit_currency', { currency: currencyCode }); } -/** - * Account footer cell. - */ -function AccountFooterCell({ payload: { currencyCode } }) { - return {intl.get('total_currency', { currency: currencyCode })}; -} - -/** - * Total credit table footer cell. - */ -function TotalCreditFooterCell({ payload: { currencyCode }, rows }) { - const credit = safeSumBy(rows, 'original.credit'); - - return ( - - - - ); -} - -/** - * Total debit table footer cell. - */ -function TotalDebitFooterCell({ payload: { currencyCode }, rows }) { - const debit = safeSumBy(rows, 'original.debit'); - - return ( - - - - ); -} /** * Actions cell renderer. */ @@ -110,22 +76,11 @@ export const useJournalTableEntriesColumns = () => { return React.useMemo( () => [ - { - Header: '#', - accessor: 'index', - Cell: ({ row: { index } }) => {index + 1}, - className: 'index', - width: 40, - disableResizing: true, - disableSortBy: true, - sticky: 'left', - }, { Header: intl.get('account'), id: 'account_id', accessor: 'account_id', Cell: AccountsListFieldCell, - Footer: AccountFooterCell, className: 'account', disableSortBy: true, width: 160, @@ -135,7 +90,6 @@ export const useJournalTableEntriesColumns = () => { Header: CreditHeaderCell, accessor: 'credit', Cell: MoneyFieldCell, - Footer: TotalCreditFooterCell, className: 'credit', disableSortBy: true, width: 100, @@ -144,7 +98,6 @@ export const useJournalTableEntriesColumns = () => { Header: DebitHeaderCell, accessor: 'debit', Cell: MoneyFieldCell, - Footer: TotalDebitFooterCell, className: 'debit', disableSortBy: true, width: 100, diff --git a/src/containers/Accounting/MakeJournal/utils.js b/src/containers/Accounting/MakeJournal/utils.js index 6ad3ff87f..4fb625f80 100644 --- a/src/containers/Accounting/MakeJournal/utils.js +++ b/src/containers/Accounting/MakeJournal/utils.js @@ -27,7 +27,8 @@ const ERROR = { ENTRIES_SHOULD_ASSIGN_WITH_CONTACT: 'ENTRIES_SHOULD_ASSIGN_WITH_CONTACT', }; -export const MIN_LINES_NUMBER = 4; +export const MIN_LINES_NUMBER = 1; +export const DEFAULT_LINES_NUMBER = 1; export const defaultEntry = { account_id: '', @@ -49,7 +50,7 @@ export const defaultManualJournal = { publish: '', branch_id: '', exchange_rate: 1, - entries: [...repeatValue(defaultEntry, 4)], + entries: [...repeatValue(defaultEntry, DEFAULT_LINES_NUMBER)], }; // Transform to edit form. diff --git a/src/containers/Expenses/ExpenseForm/ExpenseFormEntriesTable.js b/src/containers/Expenses/ExpenseForm/ExpenseFormEntriesTable.js index f0b2b82d4..41988443e 100644 --- a/src/containers/Expenses/ExpenseForm/ExpenseFormEntriesTable.js +++ b/src/containers/Expenses/ExpenseForm/ExpenseFormEntriesTable.js @@ -10,7 +10,6 @@ import { updateMinEntriesLines, updateAutoAddNewLine, updateRemoveLineByIndex, - orderingLinesIndexes, } from 'utils'; /** @@ -75,7 +74,6 @@ export default function ExpenseFormEntriesTable({ autoFocus: ['expense_account_id', 0], currencyCode }} - footer={true} /> ); } \ No newline at end of file diff --git a/src/containers/Expenses/ExpenseForm/components.js b/src/containers/Expenses/ExpenseForm/components.js index 1763e9269..25ffd9a32 100644 --- a/src/containers/Expenses/ExpenseForm/components.js +++ b/src/containers/Expenses/ExpenseForm/components.js @@ -62,14 +62,6 @@ const LandedCostHeaderCell = () => { ); }; -/** - * Amount footer cell. - */ -function AmountFooterCell({ payload: { currencyCode }, rows }) { - const total = safeSumBy(rows, 'original.amount'); - return {formattedAmount(total, currencyCode)}; -} - /** * Expense amount header cell. */ @@ -77,34 +69,17 @@ export function ExpenseAmountHeaderCell({ payload: { currencyCode } }) { return intl.get('amount_currency', { currency: currencyCode }); } -/** - * Expense account footer cell. - */ -function ExpenseAccountFooterCell() { - return ; -} - /** * Retrieve expense form table entries columns. */ export function useExpenseFormTableColumns({ landedCost }) { return React.useMemo( () => [ - { - Header: '#', - accessor: 'index', - Cell: ({ row: { index } }) => {index + 1}, - className: 'index', - width: 40, - disableResizing: true, - disableSortBy: true, - }, { Header: ExpenseCategoryHeaderCell, id: 'expense_account_id', accessor: 'expense_account_id', Cell: AccountsListFieldCell, - Footer: ExpenseAccountFooterCell, className: 'expense_account_id', disableSortBy: true, width: 40, @@ -115,7 +90,6 @@ export function useExpenseFormTableColumns({ landedCost }) { Header: ExpenseAmountHeaderCell, accessor: 'amount', Cell: MoneyFieldCell, - Footer: AmountFooterCell, disableSortBy: true, width: 40, className: 'amount', diff --git a/src/containers/Expenses/ExpenseForm/utils.js b/src/containers/Expenses/ExpenseForm/utils.js index 6c9c492f5..0f8dc0c5a 100644 --- a/src/containers/Expenses/ExpenseForm/utils.js +++ b/src/containers/Expenses/ExpenseForm/utils.js @@ -22,28 +22,7 @@ const ERROR = { 'ENTRIES_ALLOCATED_COST_COULD_NOT_DELETED', }; -// Transform API errors in toasts messages. -export const transformErrors = (errors, { setErrors }) => { - const hasError = (errorType) => errors.some((e) => e.type === errorType); - - if (hasError(ERROR.EXPENSE_ALREADY_PUBLISHED)) { - setErrors( - AppToaster.show({ - message: intl.get('the_expense_is_already_published'), - }), - ); - } - if (hasError(ERROR.ENTRIES_ALLOCATED_COST_COULD_NOT_DELETED)) { - setErrors( - AppToaster.show({ - intent: Intent.DANGER, - message: 'ENTRIES_ALLOCATED_COST_COULD_NOT_DELETED', - }), - ); - } -}; - -export const MIN_LINES_NUMBER = 4; +export const MIN_LINES_NUMBER = 1; export const defaultExpenseEntry = { amount: '', @@ -65,6 +44,29 @@ export const defaultExpense = { categories: [...repeatValue(defaultExpenseEntry, MIN_LINES_NUMBER)], }; +/** + * Transform API errors in toasts messages. + */ +export const transformErrors = (errors, { setErrors }) => { + const hasError = (errorType) => errors.some((e) => e.type === errorType); + + if (hasError(ERROR.EXPENSE_ALREADY_PUBLISHED)) { + setErrors( + AppToaster.show({ + message: intl.get('the_expense_is_already_published'), + }), + ); + } + if (hasError(ERROR.ENTRIES_ALLOCATED_COST_COULD_NOT_DELETED)) { + setErrors( + AppToaster.show({ + intent: Intent.DANGER, + message: 'ENTRIES_ALLOCATED_COST_COULD_NOT_DELETED', + }), + ); + } +}; + /** * Transformes the expense to form initial values in edit mode. */ diff --git a/src/containers/Purchases/PaymentMades/PaymentForm/PaymentMadeEntriesTable.js b/src/containers/Purchases/PaymentMades/PaymentForm/PaymentMadeEntriesTable.js index e1d961402..cdf4f0ef8 100644 --- a/src/containers/Purchases/PaymentMades/PaymentForm/PaymentMadeEntriesTable.js +++ b/src/containers/Purchases/PaymentMades/PaymentForm/PaymentMadeEntriesTable.js @@ -40,7 +40,6 @@ export default function PaymentMadeEntriesTable({ }, [onUpdateData, entries], ); - // Detarmines the right no results message before selecting vendor and aftering // selecting vendor id. const noResultsMessage = vendor_id ? ( @@ -67,7 +66,6 @@ export default function PaymentMadeEntriesTable({ currencyCode, }} noResults={noResultsMessage} - footer={true} /> ); diff --git a/src/containers/Purchases/PaymentMades/PaymentForm/components.js b/src/containers/Purchases/PaymentMades/PaymentForm/components.js index 5780d11b0..9dd45e582 100644 --- a/src/containers/Purchases/PaymentMades/PaymentForm/components.js +++ b/src/containers/Purchases/PaymentMades/PaymentForm/components.js @@ -2,7 +2,6 @@ import React from 'react'; import intl from 'react-intl-universal'; import moment from 'moment'; import { Money, ExchangeRateInputGroup } from 'components'; -import { safeSumBy, formattedAmount } from 'utils'; import { MoneyFieldCell } from 'components/DataTableCells'; import { useFormikContext } from 'formik'; import { useCurrentOrganization } from 'hooks/state'; @@ -12,36 +11,9 @@ function BillNumberAccessor(row) { return row?.bill_no ? row?.bill_no : '-'; } -function IndexTableCell({ row: { index } }) { - return {index + 1}; -} - function BillDateCell({ value }) { return moment(value).format('YYYY MMM DD'); } -/** - * Balance footer cell. - */ -function AmountFooterCell({ payload: { currencyCode }, rows }) { - const total = safeSumBy(rows, 'original.amount'); - return {formattedAmount(total, currencyCode)}; -} - -/** - * Due amount footer cell. - */ -function DueAmountFooterCell({ payload: { currencyCode }, rows }) { - const totalDueAmount = safeSumBy(rows, 'original.due_amount'); - return {formattedAmount(totalDueAmount, currencyCode)}; -} - -/** - * Payment amount footer cell. - */ -function PaymentAmountFooterCell({ payload: { currencyCode }, rows }) { - const totalPaymentAmount = safeSumBy(rows, 'original.payment_amount'); - return {formattedAmount(totalPaymentAmount, currencyCode)}; -} /** * Mobey table cell. @@ -56,15 +28,6 @@ function MoneyTableCell({ row: { original }, value }) { export function usePaymentMadeEntriesTableColumns() { return React.useMemo( () => [ - { - Header: '#', - accessor: 'index', - Cell: IndexTableCell, - width: 40, - disableResizing: true, - disableSortBy: true, - className: 'index', - }, { Header: intl.get('Date'), id: 'bill_date', @@ -84,7 +47,6 @@ export function usePaymentMadeEntriesTableColumns() { Header: intl.get('bill_amount'), accessor: 'amount', Cell: MoneyTableCell, - Footer: AmountFooterCell, disableSortBy: true, className: 'amount', }, @@ -92,7 +54,6 @@ export function usePaymentMadeEntriesTableColumns() { Header: intl.get('amount_due'), accessor: 'due_amount', Cell: MoneyTableCell, - Footer: DueAmountFooterCell, disableSortBy: true, className: 'due_amount', }, @@ -100,7 +61,6 @@ export function usePaymentMadeEntriesTableColumns() { Header: intl.get('payment_amount'), accessor: 'payment_amount', Cell: MoneyFieldCell, - Footer: PaymentAmountFooterCell, disableSortBy: true, className: 'payment_amount', }, diff --git a/src/containers/Sales/PaymentReceives/PaymentReceiveForm/PaymentReceiveItemsTable.js b/src/containers/Sales/PaymentReceives/PaymentReceiveForm/PaymentReceiveItemsTable.js index c01012125..c79c633ad 100644 --- a/src/containers/Sales/PaymentReceives/PaymentReceiveForm/PaymentReceiveItemsTable.js +++ b/src/containers/Sales/PaymentReceives/PaymentReceiveForm/PaymentReceiveItemsTable.js @@ -62,7 +62,6 @@ export default function PaymentReceiveItemsTable({ currencyCode, }} noResults={noResultsMessage} - footer={true} /> ); diff --git a/src/containers/Sales/PaymentReceives/PaymentReceiveForm/components.js b/src/containers/Sales/PaymentReceives/PaymentReceiveForm/components.js index 4f17607e6..12b13614a 100644 --- a/src/containers/Sales/PaymentReceives/PaymentReceiveForm/components.js +++ b/src/containers/Sales/PaymentReceives/PaymentReceiveForm/components.js @@ -1,11 +1,11 @@ import React from 'react'; import moment from 'moment'; import intl from 'react-intl-universal'; +import { useFormikContext } from 'formik'; import { Money, ExchangeRateInputGroup } from 'components'; import { MoneyFieldCell } from 'components/DataTableCells'; -import { safeSumBy, formattedAmount } from 'utils'; -import { useFormikContext } from 'formik'; + import { useCurrentOrganization } from 'hooks/state'; import { useEstimateIsForeignCustomer } from './utils'; @@ -16,13 +16,6 @@ function InvoiceDateCell({ value }) { return {moment(value).format('YYYY MMM DD')}; } -/** - * Index table cell. - */ -function IndexCell({ row: { index } }) { - return {index + 1}; -} - /** * Invoice number table cell accessor. */ @@ -30,30 +23,6 @@ function InvNumberCellAccessor(row) { return row?.invoice_no ? `#${row?.invoice_no || ''}` : '-'; } -/** - * Balance footer cell. - */ -function BalanceFooterCell({ payload: { currencyCode }, rows }) { - const total = safeSumBy(rows, 'original.amount'); - return {formattedAmount(total, currencyCode)}; -} - -/** - * Due amount footer cell. - */ -function DueAmountFooterCell({ payload: { currencyCode }, rows }) { - const totalDueAmount = safeSumBy(rows, 'original.due_amount'); - return {formattedAmount(totalDueAmount, currencyCode)}; -} - -/** - * Payment amount footer cell. - */ -function PaymentAmountFooterCell({ payload: { currencyCode }, rows }) { - const totalPaymentAmount = safeSumBy(rows, 'original.payment_amount'); - return {formattedAmount(totalPaymentAmount, currencyCode)}; -} - /** * Mobey table cell. */ @@ -61,10 +30,6 @@ function MoneyTableCell({ row: { original }, value }) { return ; } -function DateFooterCell() { - return intl.get('total'); -} - /** * Retrieve payment receive form entries columns. */ @@ -72,20 +37,10 @@ export const usePaymentReceiveEntriesColumns = () => { return React.useMemo( () => [ { - Header: '#', - accessor: 'index', - Cell: IndexCell, - width: 40, - disableResizing: true, - disableSortBy: true, - className: 'index', - }, - { - Header: intl.get('Date'), + Header: 'Invoice date', id: 'invoice_date', accessor: 'invoice_date', Cell: InvoiceDateCell, - Footer: DateFooterCell, disableSortBy: true, disableResizing: true, width: 250, @@ -100,7 +55,6 @@ export const usePaymentReceiveEntriesColumns = () => { { Header: intl.get('invoice_amount'), accessor: 'amount', - Footer: BalanceFooterCell, Cell: MoneyTableCell, disableSortBy: true, width: 100, @@ -109,7 +63,6 @@ export const usePaymentReceiveEntriesColumns = () => { { Header: intl.get('amount_due'), accessor: 'due_amount', - Footer: DueAmountFooterCell, Cell: MoneyTableCell, disableSortBy: true, width: 150, @@ -119,7 +72,6 @@ export const usePaymentReceiveEntriesColumns = () => { Header: intl.get('payment_amount'), accessor: 'payment_amount', Cell: MoneyFieldCell, - Footer: PaymentAmountFooterCell, disableSortBy: true, width: 150, className: 'payment_amount', diff --git a/src/containers/WarehouseTransfers/WarehouseTransferForm/WarehouseTransferEditorField.js b/src/containers/WarehouseTransfers/WarehouseTransferForm/WarehouseTransferEditorField.js index 8a69fda0c..8f24bbcee 100644 --- a/src/containers/WarehouseTransfers/WarehouseTransferForm/WarehouseTransferEditorField.js +++ b/src/containers/WarehouseTransfers/WarehouseTransferForm/WarehouseTransferEditorField.js @@ -37,7 +37,7 @@ export default function WarehouseTransferEditorField() { defaultEntry={defaultWarehouseTransferEntry} errors={error} sourceWarehouseId={values.from_warehouse_id} - distentionWarehouseId={value.to_warehouse_id} + destinationWarehouseId={values.to_warehouse_id} /> )} diff --git a/src/containers/WarehouseTransfers/WarehouseTransferForm/WarehouseTransferForm.js b/src/containers/WarehouseTransfers/WarehouseTransferForm/WarehouseTransferForm.js index 8b26dae0d..b0de6e9dd 100644 --- a/src/containers/WarehouseTransfers/WarehouseTransferForm/WarehouseTransferForm.js +++ b/src/containers/WarehouseTransfers/WarehouseTransferForm/WarehouseTransferForm.js @@ -20,9 +20,10 @@ import WarehouseTransferFormDialog from './WarehouseTransferFormDialog'; import withDashboardActions from 'containers/Dashboard/withDashboardActions'; import withSettings from 'containers/Settings/withSettings'; -import { AppToaster } from 'components'; +import { AppToaster, } from 'components'; import { useWarehouseTransferFormContext } from './WarehouseTransferFormProvider'; import { compose, orderingLinesIndexes, transactionNumber } from 'utils'; +import { WarehouseTransferObserveItemsCost } from './components'; import { defaultWarehouseTransfer, transformValueToRequest, @@ -37,13 +38,14 @@ function WarehouseTransferForm({ warehouseTransferIncrementMode, }) { const history = useHistory(); - + const { isNewMode, warehouseTransfer, createWarehouseTransferMutate, editWarehouseTransferMutate, submitPayload, + setItemCostQuery, } = useWarehouseTransferFormContext(); // WarehouseTransfer number. @@ -118,7 +120,7 @@ function WarehouseTransferForm({ .catch(onError); } }; - + return (
+
); } -export default compose(withDashboardActions, +export default compose( + withDashboardActions, withSettings(({ warehouseTransferSettings }) => ({ warehouseTransferNextNumber: warehouseTransferSettings?.nextNumber, warehouseTransferNumberPrefix: warehouseTransferSettings?.numberPrefix, warehouseTransferIncrementMode: warehouseTransferSettings?.autoIncrement, })), - )(WarehouseTransferForm); +)(WarehouseTransferForm); diff --git a/src/containers/WarehouseTransfers/WarehouseTransferForm/WarehouseTransferFormProvider.js b/src/containers/WarehouseTransfers/WarehouseTransferForm/WarehouseTransferFormProvider.js index 8bd24b3fb..57eeb82aa 100644 --- a/src/containers/WarehouseTransfers/WarehouseTransferForm/WarehouseTransferFormProvider.js +++ b/src/containers/WarehouseTransfers/WarehouseTransferForm/WarehouseTransferFormProvider.js @@ -6,10 +6,12 @@ import { useWarehouseTransfer, useCreateWarehouseTransfer, useEditWarehouseTransfer, + useItemInventoryCost, } from 'hooks/query'; import { Features } from 'common'; import { useFeatureCan } from 'hooks/state'; import { ITEMS_FILTER_ROLES_QUERY } from './utils.js'; +import { isEmpty } from 'lodash'; const WarehouseFormContext = React.createContext(); @@ -44,6 +46,23 @@ function WarehouseTransferFormProvider({ warehouseTransferId, ...props }) { isLoading: isWarehouesLoading, } = useWarehouses({}, { enabled: isWarehouseFeatureCan }); + // Inventory items cost query. + const [itemCostQuery, setItemCostQuery] = React.useState(null); + + // Detarmines whether the inventory items cost query is enabled. + const isItemsCostQueryEnabled = + !isEmpty(itemCostQuery?.date) && !isEmpty(itemCostQuery?.itemsIds); + + // Retrieves the inventory item cost. + const { data: inventoryItemsCost } = useItemInventoryCost( + { + date: itemCostQuery?.date, + items_ids: itemCostQuery?.itemsIds, + }, + { + enabled: isItemsCostQueryEnabled, + }, + ); // Create and edit warehouse mutations. const { mutateAsync: createWarehouseTransferMutate } = useCreateWarehouseTransfer(); @@ -70,6 +89,10 @@ function WarehouseTransferFormProvider({ warehouseTransferId, ...props }) { setSubmitPayload, createWarehouseTransferMutate, editWarehouseTransferMutate, + + inventoryItemsCost, + itemCostQuery, + setItemCostQuery, }; return ( diff --git a/src/containers/WarehouseTransfers/WarehouseTransferForm/components.js b/src/containers/WarehouseTransfers/WarehouseTransferForm/components.js new file mode 100644 index 000000000..1f4bb7f82 --- /dev/null +++ b/src/containers/WarehouseTransfers/WarehouseTransferForm/components.js @@ -0,0 +1,20 @@ +import React from 'react'; +import { FormikObserver } from 'components'; +import { useWarehouseTransferFormContext } from './WarehouseTransferFormProvider'; + +export function WarehouseTransferObserveItemsCost() { + const { setItemCostQuery } = useWarehouseTransferFormContext(); + + // Handle the form change. + const handleFormChange = (values) => { + const itemsIds = values.entries + .filter((e) => e.item_id) + .map((e) => e.item_id); + + setItemCostQuery({ + date: values.date, + itemsIds, + }); + }; + return ; +} diff --git a/src/containers/WarehouseTransfers/WarehouseTransferForm/hooks.ts b/src/containers/WarehouseTransfers/WarehouseTransferForm/hooks.ts index ef462a7c2..9659a8a33 100644 --- a/src/containers/WarehouseTransfers/WarehouseTransferForm/hooks.ts +++ b/src/containers/WarehouseTransfers/WarehouseTransferForm/hooks.ts @@ -65,10 +65,10 @@ export const useFetchItemWarehouseQuantity = () => { return isItemSuccess ? { ...tableRow, - warehouses: [], + warehouses: transformWarehousesQuantity(item), } : null; - }, [isItemSuccess, tableRow]); + }, [isItemSuccess, item, tableRow]); // Reset the table row. const resetTableRow = React.useCallback(() => { @@ -84,3 +84,11 @@ export const useFetchItemWarehouseQuantity = () => { newRowMeta, }; }; + +const transformWarehousesQuantity = (item) => { + return item.item_warehouses.map((warehouse) => ({ + warehouseId: warehouse.warehouse_id, + quantityOnHand: warehouse.quantity_on_hand, + quantityOnHandFormatted: warehouse.quantity_on_hand_formatted, + })); +}; diff --git a/src/containers/WarehouseTransfers/WarehouseTransferForm/utils.js b/src/containers/WarehouseTransfers/WarehouseTransferForm/utils.js index 015ed1976..37a58b62c 100644 --- a/src/containers/WarehouseTransfers/WarehouseTransferForm/utils.js +++ b/src/containers/WarehouseTransfers/WarehouseTransferForm/utils.js @@ -22,14 +22,12 @@ import { updateMinEntriesLines, updateRemoveLineByIndex, } from 'utils'; - -// import { defaultFastFieldShouldUpdate } from 'utils'; import { updateItemsEntriesTotal, ensureEntriesHaveEmptyLine, } from 'containers/Entries/utils'; -export const MIN_LINES_NUMBER = 4; +export const MIN_LINES_NUMBER = 1; // Default warehouse transfer entry. export const defaultWarehouseTransferEntry = { diff --git a/src/containers/WarehouseTransfers/utils.js b/src/containers/WarehouseTransfers/utils.js index a88d1f8bd..e64fe3d41 100644 --- a/src/containers/WarehouseTransfers/utils.js +++ b/src/containers/WarehouseTransfers/utils.js @@ -1,15 +1,10 @@ import React from 'react'; import intl from 'react-intl-universal'; import { find, get } from 'lodash'; -import { Tooltip, Button, Intent, Position } from '@blueprintjs/core'; +import { Button, Menu, MenuItem } from '@blueprintjs/core'; +import { Popover2 } from '@blueprintjs/popover2'; -import { - MoneyFieldCell, - FormatDateCell, - Icon, - AppToaster, - T, -} from 'components'; +import { MoneyFieldCell, Icon, T } from 'components'; import { InputGroupCell, ItemsListCell } from 'components/DataTableCells'; // Index table cell. @@ -31,37 +26,44 @@ export function ActionsCellRenderer({ removeRow(index); }; + const exampleMenu = ( + + + + ); + return ( - } position={Position.LEFT}> +