feat(branches & warehouses): fix api.

This commit is contained in:
elforjani13
2022-03-08 15:47:28 +02:00
parent 0f4176ae79
commit 2d34baa7a5
26 changed files with 233 additions and 60 deletions

View File

@@ -108,7 +108,7 @@ function MakeJournalEntriesForm({
return;
}
const form = {
...omit(values, ['journal_number', 'journal_number_manually']),
...omit(values, ['journal_number_manually']),
...(values.journal_number_manually && {
journal_number: values.journal_number,
}),

View File

@@ -1,5 +1,7 @@
import React, { createContext, useState } from 'react';
import { isEqual, isUndefined } from 'lodash';
import { Features } from 'common';
import { useFeatureCan } from 'hooks/state';
import DashboardInsider from 'components/Dashboard/DashboardInsider';
import {
useAccounts,
@@ -18,7 +20,11 @@ const MakeJournalFormContext = createContext();
/**
* Make journal form provider.
*/
function MakeJournalProvider({ journalId, baseCurrency, ...props }) {
function MakeJournalProvider({ journalId, query, baseCurrency, ...props }) {
// Features guard.
const { featureCan } = useFeatureCan();
const isBranchFeatureCan = featureCan(Features.Branches);
// Load the accounts list.
const { data: accounts, isLoading: isAccountsLoading } = useAccounts();
@@ -48,7 +54,7 @@ function MakeJournalProvider({ journalId, baseCurrency, ...props }) {
data: branches,
isLoading: isBranchesLoading,
isSuccess: isBranchesSuccess,
} = useBranches();
} = useBranches(query, { enabled: isBranchFeatureCan });
// Submit form payload.
const [submitPayload, setSubmitPayload] = useState({});

View File

@@ -46,7 +46,7 @@ export const defaultManualJournal = {
currency_code: '',
publish: '',
branch_id: '',
exchange_rate: '',
exchange_rate: 1,
entries: [...repeatValue(defaultEntry, 4)],
};