feat(warehouses transfer): warehouse transfer auto-increment.

This commit is contained in:
elforjani13
2022-03-15 13:46:27 +02:00
parent f45d5ecf42
commit a91f303111
5 changed files with 19 additions and 8 deletions

View File

@@ -21,7 +21,7 @@ export default (mapState) => {
cashflowSetting: state.settings.data.cashflow,
creditNoteSettings: state.settings.data.creditNote,
vendorsCreditNoteSetting: state.settings.data.vendorCredit,
warehouseTransferSettings: state.settings.data.warehouseTransfer,
warehouseTransferSettings: state.settings.data.warehouseTransfers,
};
return mapState ? mapState(mapped, state, props) : mapped;
};

View File

@@ -18,6 +18,7 @@ import WarehouseTransferFormFooter from './WarehouseTransferFormFooter';
import WarehouseTransferFloatingActions from './WarehouseTransferFloatingActions';
import WarehouseTransferFormDialog from './WarehouseTransferFormDialog';
import withDashboardActions from 'containers/Dashboard/withDashboardActions';
import withSettings from 'containers/Settings/withSettings';
import { AppToaster } from 'components';
import { useWarehouseTransferFormContext } from './WarehouseTransferFormProvider';
@@ -36,7 +37,7 @@ function WarehouseTransferForm({
warehouseTransferIncrementMode,
}) {
const history = useHistory();
const {
isNewMode,
warehouseTransfer,
@@ -58,6 +59,9 @@ function WarehouseTransferForm({
? { ...transformToEditForm(warehouseTransfer) }
: {
...defaultWarehouseTransfer,
...(warehouseTransferIncrementMode && {
transaction_number: warehouseTransferNumber,
}),
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);

View File

@@ -8,9 +8,10 @@ import { useFormikContext } from 'formik';
export default function WarehouseTransferFormDialog() {
// Update the form once the credit number form submit confirm.
const handleWarehouseNumberFormConfirm = ({ incrementNumber, manually }) => {
setFieldValue('transfer_no', incrementNumber || '');
setFieldValue('transfer_no_manually', manually);
setFieldValue('transaction_number', incrementNumber || '');
setFieldValue('transaction_no_manually', manually);
};
const { setFieldValue } = useFormikContext();
return (
<React.Fragment>

View File

@@ -149,8 +149,8 @@ export function useSettingsVendorCredits(props) {
*/
export function useSettingsWarehouseTransfers(props) {
return useSettingsQuery(
[t.SETTING, t.SETTING_WAREHOUSE_TRANSFER],
{ group: 'warehouse_transfer' },
[t.SETTING, t.SETTING_WAREHOUSE_TRANSFERS],
{ group: 'warehouse_transfers' },
props,
);
}

View File

@@ -149,7 +149,7 @@ const SETTING = {
SETTING_EDIT_SMS_NOTIFICATION: 'SETTING_EDIT_SMS_NOTIFICATION',
SETTING_CREDIT_NOTES: 'SETTING_CREDIT_NOTES',
SETTING_VENDOR_CREDITS: 'SETTING_VENDOR_CREDITS',
SETTING_WAREHOUSE_TRANSFER: 'SETTING_WAREHOUSE_TRANSFER',
SETTING_WAREHOUSE_TRANSFER: 'SETTING_WAREHOUSE_TRANSFERS',
};
const ORGANIZATIONS = {