mirror of
https://github.com/bigcapitalhq/bigcapital.git
synced 2026-02-22 15:50:32 +00:00
feat(warehouses transfer): warehouse transfer auto-increment.
This commit is contained in:
@@ -21,7 +21,7 @@ export default (mapState) => {
|
|||||||
cashflowSetting: state.settings.data.cashflow,
|
cashflowSetting: state.settings.data.cashflow,
|
||||||
creditNoteSettings: state.settings.data.creditNote,
|
creditNoteSettings: state.settings.data.creditNote,
|
||||||
vendorsCreditNoteSetting: state.settings.data.vendorCredit,
|
vendorsCreditNoteSetting: state.settings.data.vendorCredit,
|
||||||
warehouseTransferSettings: state.settings.data.warehouseTransfer,
|
warehouseTransferSettings: state.settings.data.warehouseTransfers,
|
||||||
};
|
};
|
||||||
return mapState ? mapState(mapped, state, props) : mapped;
|
return mapState ? mapState(mapped, state, props) : mapped;
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -18,6 +18,7 @@ import WarehouseTransferFormFooter from './WarehouseTransferFormFooter';
|
|||||||
import WarehouseTransferFloatingActions from './WarehouseTransferFloatingActions';
|
import WarehouseTransferFloatingActions from './WarehouseTransferFloatingActions';
|
||||||
import WarehouseTransferFormDialog from './WarehouseTransferFormDialog';
|
import WarehouseTransferFormDialog from './WarehouseTransferFormDialog';
|
||||||
import withDashboardActions from 'containers/Dashboard/withDashboardActions';
|
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 { useWarehouseTransferFormContext } from './WarehouseTransferFormProvider';
|
||||||
@@ -36,7 +37,7 @@ function WarehouseTransferForm({
|
|||||||
warehouseTransferIncrementMode,
|
warehouseTransferIncrementMode,
|
||||||
}) {
|
}) {
|
||||||
const history = useHistory();
|
const history = useHistory();
|
||||||
|
|
||||||
const {
|
const {
|
||||||
isNewMode,
|
isNewMode,
|
||||||
warehouseTransfer,
|
warehouseTransfer,
|
||||||
@@ -58,6 +59,9 @@ function WarehouseTransferForm({
|
|||||||
? { ...transformToEditForm(warehouseTransfer) }
|
? { ...transformToEditForm(warehouseTransfer) }
|
||||||
: {
|
: {
|
||||||
...defaultWarehouseTransfer,
|
...defaultWarehouseTransfer,
|
||||||
|
...(warehouseTransferIncrementMode && {
|
||||||
|
transaction_number: warehouseTransferNumber,
|
||||||
|
}),
|
||||||
entries: orderingLinesIndexes(defaultWarehouseTransfer.entries),
|
entries: orderingLinesIndexes(defaultWarehouseTransfer.entries),
|
||||||
}),
|
}),
|
||||||
}),
|
}),
|
||||||
@@ -142,4 +146,10 @@ function WarehouseTransferForm({
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
export default compose(withDashboardActions)(WarehouseTransferForm);
|
export default compose(withDashboardActions,
|
||||||
|
withSettings(({ warehouseTransferSettings }) => ({
|
||||||
|
warehouseTransferNextNumber: warehouseTransferSettings?.nextNumber,
|
||||||
|
warehouseTransferNumberPrefix: warehouseTransferSettings?.numberPrefix,
|
||||||
|
warehouseTransferIncrementMode: warehouseTransferSettings?.autoIncrement,
|
||||||
|
})),
|
||||||
|
)(WarehouseTransferForm);
|
||||||
|
|||||||
@@ -8,9 +8,10 @@ import { useFormikContext } from 'formik';
|
|||||||
export default function WarehouseTransferFormDialog() {
|
export default function WarehouseTransferFormDialog() {
|
||||||
// Update the form once the credit number form submit confirm.
|
// Update the form once the credit number form submit confirm.
|
||||||
const handleWarehouseNumberFormConfirm = ({ incrementNumber, manually }) => {
|
const handleWarehouseNumberFormConfirm = ({ incrementNumber, manually }) => {
|
||||||
setFieldValue('transfer_no', incrementNumber || '');
|
setFieldValue('transaction_number', incrementNumber || '');
|
||||||
setFieldValue('transfer_no_manually', manually);
|
setFieldValue('transaction_no_manually', manually);
|
||||||
};
|
};
|
||||||
|
|
||||||
const { setFieldValue } = useFormikContext();
|
const { setFieldValue } = useFormikContext();
|
||||||
return (
|
return (
|
||||||
<React.Fragment>
|
<React.Fragment>
|
||||||
|
|||||||
@@ -149,8 +149,8 @@ export function useSettingsVendorCredits(props) {
|
|||||||
*/
|
*/
|
||||||
export function useSettingsWarehouseTransfers(props) {
|
export function useSettingsWarehouseTransfers(props) {
|
||||||
return useSettingsQuery(
|
return useSettingsQuery(
|
||||||
[t.SETTING, t.SETTING_WAREHOUSE_TRANSFER],
|
[t.SETTING, t.SETTING_WAREHOUSE_TRANSFERS],
|
||||||
{ group: 'warehouse_transfer' },
|
{ group: 'warehouse_transfers' },
|
||||||
props,
|
props,
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -149,7 +149,7 @@ const SETTING = {
|
|||||||
SETTING_EDIT_SMS_NOTIFICATION: 'SETTING_EDIT_SMS_NOTIFICATION',
|
SETTING_EDIT_SMS_NOTIFICATION: 'SETTING_EDIT_SMS_NOTIFICATION',
|
||||||
SETTING_CREDIT_NOTES: 'SETTING_CREDIT_NOTES',
|
SETTING_CREDIT_NOTES: 'SETTING_CREDIT_NOTES',
|
||||||
SETTING_VENDOR_CREDITS: 'SETTING_VENDOR_CREDITS',
|
SETTING_VENDOR_CREDITS: 'SETTING_VENDOR_CREDITS',
|
||||||
SETTING_WAREHOUSE_TRANSFER: 'SETTING_WAREHOUSE_TRANSFER',
|
SETTING_WAREHOUSE_TRANSFER: 'SETTING_WAREHOUSE_TRANSFERS',
|
||||||
};
|
};
|
||||||
|
|
||||||
const ORGANIZATIONS = {
|
const ORGANIZATIONS = {
|
||||||
|
|||||||
Reference in New Issue
Block a user