@@ -24,7 +21,7 @@ function WizardSetupSteps({
{registerWizardSteps.map((step, index) => (
))}
@@ -32,5 +29,3 @@ function WizardSetupSteps({
);
}
-
-export default WizardSetupSteps;
diff --git a/client/src/hooks/query/accounts.js b/client/src/hooks/query/accounts.js
index 8acaebee1..2a2d54738 100644
--- a/client/src/hooks/query/accounts.js
+++ b/client/src/hooks/query/accounts.js
@@ -1,5 +1,5 @@
import { useMutation, useQueryClient } from 'react-query';
-import { useQueryTenant, useRequestQuery } from '../useQueryRequest';
+import { useRequestQuery } from '../useQueryRequest';
import useApiRequest from '../useRequest';
import t from './types';
@@ -24,9 +24,7 @@ export function useAccounts(query, props) {
[t.ACCOUNTS, query],
{ method: 'get', url: 'accounts', params: query },
{
- select: (response) => {
- return response.data.accounts;
- },
+ select: (res) => res.data.accounts,
defaultData: [],
...props,
},
diff --git a/client/src/hooks/query/authentication.js b/client/src/hooks/query/authentication.js
index 8a780b210..dc86ac5e8 100644
--- a/client/src/hooks/query/authentication.js
+++ b/client/src/hooks/query/authentication.js
@@ -1,4 +1,3 @@
-import { useEffect } from 'react';
import { useMutation } from 'react-query';
import useApiRequest from '../useRequest';
import { useAuthActions } from '../state';
@@ -10,20 +9,16 @@ export const useAuthLogin = (props) => {
const { setLogin } = useAuthActions();
const apiRequest = useApiRequest();
- const states = useMutation(
+ return useMutation(
(values) => apiRequest.post('auth/login', values),
{
select: (res) => res.data,
+ onSuccess: (data) => {
+ setLogin(data.data);
+ },
...props
}
);
- const { isSuccess, data: response } = states;
-
- useEffect(() => {
- if (isSuccess) { setLogin(response.data); }
- }, [isSuccess, response, setLogin]);
-
- return states;
};
/**
diff --git a/client/src/hooks/query/index.js b/client/src/hooks/query/index.js
index 268856ea1..1ce3eef49 100644
--- a/client/src/hooks/query/index.js
+++ b/client/src/hooks/query/index.js
@@ -21,3 +21,5 @@ export * from './users';
export * from './invite';
export * from './exchangeRates';
export * from './contacts';
+export * from './subscriptions';
+export * from './organization';
diff --git a/client/src/hooks/query/organization.js b/client/src/hooks/query/organization.js
index 60fb83fed..2a70cda75 100644
--- a/client/src/hooks/query/organization.js
+++ b/client/src/hooks/query/organization.js
@@ -1,8 +1,8 @@
-import { useMutation } from 'react-query';
+import { useMutation, useQueryClient } from 'react-query';
+import { batch } from 'react-redux';
import t from './types';
import useApiRequest from '../useRequest';
import { useRequestQuery } from '../useQueryRequest';
-import { useEffect } from 'react';
import { useSetOrganizations, useSetSubscriptions } from '../state';
import { omit } from 'lodash';
@@ -33,29 +33,26 @@ export function useCurrentOrganization(props) {
const setOrganizations = useSetOrganizations();
const setSubscriptions = useSetSubscriptions();
- const query = useRequestQuery(
+ return useRequestQuery(
[t.ORGANIZATION_CURRENT],
{ method: 'get', url: `organization/current` },
{
select: (res) => res.data.organization,
defaultData: {},
+ onSuccess: (data) => {
+ const organization = omit(data, ['subscriptions']);
+
+ batch(() => {
+ // Sets subscriptions.
+ setSubscriptions(data.subscriptions);
+
+ // Sets organizations.
+ setOrganizations([organization]);
+ });
+ },
...props,
},
);
-
- useEffect(() => {
- if (query.isSuccess) {
- const organization = omit(query.data, ['subscriptions']);
-
- // Sets organizations.
- setOrganizations([organization]);
-
- // Sets subscriptions.
- setSubscriptions(query.data.subscriptions);
- }
- }, [query.data, query.isSuccess, setOrganizations, setSubscriptions]);
-
- return query;
}
/**
@@ -63,30 +60,46 @@ export function useCurrentOrganization(props) {
*/
export function useBuildTenant(props) {
const apiRequest = useApiRequest();
+ const queryClient = useQueryClient();
- return useMutation(
- (values) => apiRequest.post('organization/build'),
- {
- onSuccess: (res, values) => {
-
- },
- ...props,
+ return useMutation((values) => apiRequest.post('organization/build'), {
+ onSuccess: (res, values) => {
+ queryClient.invalidateQueries(t.ORGANIZATION_CURRENT);
+ queryClient.invalidateQueries(t.ORGANIZATIONS);
},
- );
-};
+ ...props,
+ });
+}
/**
* Seeds the current tenant
*/
export function useSeedTenant() {
const apiRequest = useApiRequest();
+ const queryClient = useQueryClient();
+
+ return useMutation((values) => apiRequest.post('organization/seed'), {
+ onSuccess: (res) => {
+ queryClient.invalidateQueries(t.ORGANIZATION_CURRENT);
+ queryClient.invalidateQueries(t.ORGANIZATIONS);
+ },
+ });
+}
+
+/**
+ * Organization setup.
+ */
+export function useOrganizationSetup() {
+ const apiRequest = useApiRequest();
+ const queryClient = useQueryClient();
return useMutation(
- (values) => apiRequest.post('organization/seed'),
+ (values) => apiRequest.post(`setup/organization`, values),
{
onSuccess: (res) => {
-
+ queryClient.invalidateQueries(t.ORGANIZATION_CURRENT);
+ queryClient.invalidateQueries(t.ORGANIZATIONS);
},
- }
- )
-};
\ No newline at end of file
+ },
+ );
+}
diff --git a/client/src/hooks/query/subscriptions.js b/client/src/hooks/query/subscriptions.js
new file mode 100644
index 000000000..ebab2893e
--- /dev/null
+++ b/client/src/hooks/query/subscriptions.js
@@ -0,0 +1,44 @@
+import { useEffect } from "react"
+import { useMutation, useQueryClient } from "react-query";
+import { useRequestQuery } from "../useQueryRequest";
+import useApiRequest from "../useRequest";
+import { useSetSubscriptions } from '../state/subscriptions';
+import T from './types';
+
+/**
+ * Subscription payment via voucher.
+ */
+export const usePaymentByVoucher = (props) => {
+ const apiRequest = useApiRequest();
+ const queryClient = useQueryClient();
+
+ return useMutation(
+ (values) => apiRequest.post('subscription/license/payment', values),
+ {
+ onSuccess: () => {
+ queryClient.invalidateQueries(T.SUBSCRIPTIONS);
+ queryClient.invalidateQueries(T.ORGANIZATION_CURRENT);
+ queryClient.invalidateQueries(T.ORGANIZATIONS);
+ },
+ ...props,
+ }
+ );
+}
+
+/**
+ * Fetches the organization subscriptions.
+ */
+export const useOrganizationSubscriptions = (props) => {
+ const setSubscriptions = useSetSubscriptions();
+
+ const state = useRequestQuery(
+ [T.SUBSCRIPTIONS],
+ { method: 'get', url: 'subscriptions' },
+ { ...props },
+ );
+ useEffect(() => {
+ if (state.isSuccess) {
+ setSubscriptions(state.data);
+ }
+ }, [state.isSuccess, state.data, setSubscriptions])
+};
\ No newline at end of file
diff --git a/client/src/hooks/query/types.js b/client/src/hooks/query/types.js
index 8cc419f63..bfbb32c69 100644
--- a/client/src/hooks/query/types.js
+++ b/client/src/hooks/query/types.js
@@ -94,6 +94,10 @@ const ORGANIZATIONS = {
ORGANIZATION_CURRENT: 'ORGANIZATION_CURRENT',
};
+const SUBSCRIPTIONS = {
+ SUBSCRIPTIONS: 'SUBSCRIPTIONS',
+}
+
export default {
...ACCOUNTS,
...BILLS,
@@ -111,4 +115,5 @@ export default {
...USERS,
...SETTING,
...ORGANIZATIONS,
+ ...SUBSCRIPTIONS
};
diff --git a/client/src/hooks/state/subscriptions.js b/client/src/hooks/state/subscriptions.js
index 7da587908..95f2cdd4d 100644
--- a/client/src/hooks/state/subscriptions.js
+++ b/client/src/hooks/state/subscriptions.js
@@ -11,4 +11,4 @@ export const useSetSubscriptions = () => {
return useCallback((subscriptions) => {
dispatch(setSubscriptions(subscriptions));
}, [dispatch]);
-}
\ No newline at end of file
+}
diff --git a/client/src/store/Bills/bills.reducer.js b/client/src/store/Bills/bills.reducer.js
index 1e2b9a302..0d58b54c5 100644
--- a/client/src/store/Bills/bills.reducer.js
+++ b/client/src/store/Bills/bills.reducer.js
@@ -1,7 +1,8 @@
import { createReducer } from '@reduxjs/toolkit';
-import { persistReducer } from 'redux-persist';
+import { persistReducer, purgeStoredState } from 'redux-persist';
import storage from 'redux-persist/lib/storage';
import { createTableStateReducers } from 'store/tableState.reducer';
+import t from 'store/types';
const initialState = {
tableState: {
@@ -12,15 +13,21 @@ const initialState = {
const STORAGE_KEY = 'bigcapital:bills';
+const CONFIG = {
+ key: STORAGE_KEY,
+ whitelist: ['tableState'],
+ storage,
+};
+
const reducerInstance = createReducer(initialState, {
...createTableStateReducers('BILLS'),
+
+ [t.RESET]: () => {
+ purgeStoredState(CONFIG);
+ }
});
export default persistReducer(
- {
- key: STORAGE_KEY,
- whitelist: ['tableState'],
- storage,
- },
+ CONFIG,
reducerInstance,
);
\ No newline at end of file
diff --git a/client/src/store/Estimate/estimates.reducer.js b/client/src/store/Estimate/estimates.reducer.js
index bc26dea13..7ddcdba12 100644
--- a/client/src/store/Estimate/estimates.reducer.js
+++ b/client/src/store/Estimate/estimates.reducer.js
@@ -1,9 +1,10 @@
import { createReducer } from '@reduxjs/toolkit';
-import { persistReducer } from 'redux-persist';
+import { persistReducer, purgeStoredState } from 'redux-persist';
import storage from 'redux-persist/lib/storage';
import {
createTableStateReducers,
} from 'store/tableState.reducer';
+import t from 'store/types';
const initialState = {
tableState: {
@@ -12,17 +13,23 @@ const initialState = {
},
};
-const reducerInstance = createReducer(initialState, {
- ...createTableStateReducers('ESTIMATES'),
-});
-
const STORAGE_KEY = 'bigcapital:estimates';
-export default persistReducer(
- {
- key: STORAGE_KEY,
- whitelist: ['tableState'],
- storage,
+const CONFIG = {
+ key: STORAGE_KEY,
+ whitelist: ['tableState'],
+ storage,
+};
+
+const reducerInstance = createReducer(initialState, {
+ ...createTableStateReducers('ESTIMATES'),
+
+ [t.RESET]: () => {
+ purgeStoredState(CONFIG);
},
+});
+
+export default persistReducer(
+ CONFIG,
reducerInstance,
);
diff --git a/client/src/store/Invoice/invoices.reducer.js b/client/src/store/Invoice/invoices.reducer.js
index da6fce26f..e6492a545 100644
--- a/client/src/store/Invoice/invoices.reducer.js
+++ b/client/src/store/Invoice/invoices.reducer.js
@@ -1,9 +1,10 @@
import { createReducer } from '@reduxjs/toolkit';
-import { persistReducer } from 'redux-persist';
+import { persistReducer, purgeStoredState } from 'redux-persist';
import storage from 'redux-persist/lib/storage';
import {
createTableStateReducers,
} from 'store/tableState.reducer';
+import t from 'store/types';
const initialState = {
tableState: {
@@ -12,17 +13,23 @@ const initialState = {
},
};
-const reducerInstance = createReducer(initialState, {
- ...createTableStateReducers('INVOICES'),
-});
-
const STORAGE_KEY = 'bigcapital:invoices';
+const CONFIG = {
+ key: STORAGE_KEY,
+ whitelist: ['tableState'],
+ storage,
+};
+
+const reducerInstance = createReducer(initialState, {
+ ...createTableStateReducers('INVOICES'),
+
+ [t.RESET]: () => {
+ purgeStoredState(CONFIG);
+ }
+});
+
export default persistReducer(
- {
- key: STORAGE_KEY,
- whitelist: ['tableState'],
- storage,
- },
+ CONFIG,
reducerInstance,
);
diff --git a/client/src/store/PaymentMades/paymentMades.reducer.js b/client/src/store/PaymentMades/paymentMades.reducer.js
index 9dbd113b7..c1531fec0 100644
--- a/client/src/store/PaymentMades/paymentMades.reducer.js
+++ b/client/src/store/PaymentMades/paymentMades.reducer.js
@@ -1,9 +1,10 @@
import { createReducer } from '@reduxjs/toolkit';
-import { persistReducer } from 'redux-persist';
+import { persistReducer, purgeStoredState } from 'redux-persist';
import storage from 'redux-persist/lib/storage';
import {
createTableStateReducers,
} from 'store/tableState.reducer';
+import t from 'store/types';
const initialState = {
tableState: {
@@ -13,17 +14,20 @@ const initialState = {
},
};
-const reducerInstance = createReducer(initialState, {
- ...createTableStateReducers('PAYMENT_MADES'),
-});
-
const STORAGE_KEY = 'bigcapital:paymentMades';
-export default persistReducer(
- {
- key: STORAGE_KEY,
- whitelist: ['tableState'],
- storage,
+const CONFIG = {
+ key: STORAGE_KEY,
+ whitelist: ['tableState'],
+ storage,
+}
+
+const reducerInstance = createReducer(initialState, {
+ ...createTableStateReducers('PAYMENT_MADES'),
+
+ [t.RESET]: () => {
+ purgeStoredState(CONFIG);
},
- reducerInstance,
-);
+});
+
+export default persistReducer(CONFIG, reducerInstance);
diff --git a/client/src/store/PaymentReceives/paymentReceives.reducer.js b/client/src/store/PaymentReceives/paymentReceives.reducer.js
index fc2be7e6b..2bddc3138 100644
--- a/client/src/store/PaymentReceives/paymentReceives.reducer.js
+++ b/client/src/store/PaymentReceives/paymentReceives.reducer.js
@@ -1,9 +1,10 @@
import { createReducer } from '@reduxjs/toolkit';
-import { persistReducer } from 'redux-persist';
+import { persistReducer, purgeStoredState } from 'redux-persist';
import storage from 'redux-persist/lib/storage';
import {
createTableStateReducers,
} from 'store/tableState.reducer';
+import t from 'store/types';
const initialState = {
tableState: {
@@ -12,17 +13,23 @@ const initialState = {
},
};
-const reducerInstance = createReducer(initialState, {
- ...createTableStateReducers('PAYMENT_RECEIVES'),
-});
-
const STORAGE_KEY = 'bigcapital:paymentReceives';
-export default persistReducer(
- {
- key: STORAGE_KEY,
- whitelist: ['tableState'],
- storage,
+const CONFIG = {
+ key: STORAGE_KEY,
+ whitelist: ['tableState'],
+ storage,
+};
+
+const reducerInstance = createReducer(initialState, {
+ ...createTableStateReducers('PAYMENT_RECEIVES'),
+
+ [t.RESET]: () => {
+ purgeStoredState(CONFIG);
},
+});
+
+export default persistReducer(
+ CONFIG,
reducerInstance,
);
diff --git a/client/src/store/accounts/accounts.reducer.js b/client/src/store/accounts/accounts.reducer.js
index 194b7719a..e486b131d 100644
--- a/client/src/store/accounts/accounts.reducer.js
+++ b/client/src/store/accounts/accounts.reducer.js
@@ -1,25 +1,27 @@
-import { createReducer} from '@reduxjs/toolkit';
-import { persistReducer } from 'redux-persist';
+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';
const initialState = {
tableState: {},
};
-const reducerInstance = createReducer(initialState, {
- ...createTableStateReducers('ACCOUNTS'),
-});
-
const STORAGE_KEY = 'bigcapital:accounts';
-export default persistReducer(
- {
- key: STORAGE_KEY,
- whitelist: ['tableState'],
- storage,
- },
- reducerInstance,
-);
+const CONFIG = {
+ key: STORAGE_KEY,
+ whitelist: ['tableState'],
+ storage,
+};
+
+const reducerInstance = createReducer(initialState, {
+ ...createTableStateReducers('ACCOUNTS'),
+
+ [t.RESET]: () => {
+ purgeStoredState(CONFIG);
+ }
+});
+
+export default persistReducer(CONFIG, reducerInstance);
diff --git a/client/src/store/authentication/authentication.reducer.js b/client/src/store/authentication/authentication.reducer.js
index abc814e47..0e5b9fde3 100644
--- a/client/src/store/authentication/authentication.reducer.js
+++ b/client/src/store/authentication/authentication.reducer.js
@@ -1,5 +1,6 @@
import { createReducer } from '@reduxjs/toolkit';
import { persistReducer } from 'redux-persist';
+import purgeStoredState from 'redux-persist/es/purgeStoredState';
import storage from 'redux-persist/lib/storage';
import t from 'store/types';
@@ -14,10 +15,16 @@ const initialState = {
};
const STORAGE_KEY = 'bigcapital:authentication';
+const CONFIG = {
+ key: STORAGE_KEY,
+ blacklist: ['errors'],
+ storage,
+};
const reducerInstance = createReducer(initialState, {
[t.LOGIN_SUCCESS]: (state, action) => {
const { token, user, tenant } = action.payload;
+
state.token = token;
state.user = user;
state.organization = tenant.organization_id;
@@ -32,14 +39,14 @@ const reducerInstance = createReducer(initialState, {
[t.LOGIN_CLEAR_ERRORS]: (state) => {
state.errors = [];
},
+
+ [t.RESET]: () => {
+ purgeStoredState(CONFIG);
+ }
});
export default persistReducer(
- {
- key: STORAGE_KEY,
- blacklist: ['errors'],
- storage,
- },
+ CONFIG,
reducerInstance,
);
diff --git a/client/src/store/dashboard/dashboard.reducer.js b/client/src/store/dashboard/dashboard.reducer.js
index 2f5bee3c3..c88704b54 100644
--- a/client/src/store/dashboard/dashboard.reducer.js
+++ b/client/src/store/dashboard/dashboard.reducer.js
@@ -1,6 +1,6 @@
import t from 'store/types';
import { createReducer } from '@reduxjs/toolkit';
-import { persistReducer } from 'redux-persist';
+import { persistReducer, purgeStoredState } from 'redux-persist';
import storage from 'redux-persist/lib/storage';
const initialState = {
@@ -20,6 +20,12 @@ const initialState = {
const STORAGE_KEY = 'bigcapital:dashboard';
+const CONFIG = {
+ key: STORAGE_KEY,
+ whitelist: ['sidebarExpended', 'previousSidebarExpended'],
+ storage,
+};
+
const reducerInstance = createReducer(initialState, {
[t.CHANGE_DASHBOARD_PAGE_TITLE]: (state, action) => {
state.pageTitle = action.pageTitle;
@@ -115,19 +121,13 @@ const reducerInstance = createReducer(initialState, {
const { backLink } = action.payload;
state.backLink = backLink;
},
+
+ [t.RESET]: () => {
+ purgeStoredState(CONFIG);
+ },
});
-export default persistReducer(
- {
- key: STORAGE_KEY,
- whitelist: [
- 'sidebarExpended',
- 'previousSidebarExpended',
- ],
- storage,
- },
- reducerInstance,
-);
+export default persistReducer(CONFIG, reducerInstance);
export const getDialogPayload = (state, dialogName) => {
return typeof state.dashboard.dialogs[dialogName] !== 'undefined'
diff --git a/client/src/store/expenses/expenses.reducer.js b/client/src/store/expenses/expenses.reducer.js
index 7c9557ace..318360938 100644
--- a/client/src/store/expenses/expenses.reducer.js
+++ b/client/src/store/expenses/expenses.reducer.js
@@ -1,7 +1,8 @@
import { createReducer } from '@reduxjs/toolkit';
-import { persistReducer } from 'redux-persist';
+import { persistReducer, purgeStoredState } from 'redux-persist';
import storage from 'redux-persist/lib/storage';
import { createTableStateReducers } from 'store/tableState.reducer';
+import t from 'store/types';
const initialState = {
tableState: {
@@ -10,17 +11,20 @@ const initialState = {
},
};
-const reducerInstance = createReducer(initialState, {
- ...createTableStateReducers('EXPENSES'),
-});
-
const STORAGE_KEY = 'bigcapital:expenses';
-export default persistReducer(
- {
- key: STORAGE_KEY,
- whitelist: ['tableState'],
- storage,
- },
- reducerInstance,
-);
+const CONFIG = {
+ key: STORAGE_KEY,
+ whitelist: ['tableState'],
+ storage,
+};
+
+const reducerInstance = createReducer(initialState, {
+ ...createTableStateReducers('EXPENSES'),
+
+ [t.RESET]: () => {
+ purgeStoredState(CONFIG);
+ }
+});
+
+export default persistReducer(CONFIG, reducerInstance);
diff --git a/client/src/store/inventoryAdjustments/inventoryAdjustment.reducer.js b/client/src/store/inventoryAdjustments/inventoryAdjustment.reducer.js
index 96a46b517..15e673224 100644
--- a/client/src/store/inventoryAdjustments/inventoryAdjustment.reducer.js
+++ b/client/src/store/inventoryAdjustments/inventoryAdjustment.reducer.js
@@ -1,7 +1,8 @@
import { createReducer } from '@reduxjs/toolkit';
-import { persistReducer } from 'redux-persist';
+import { persistReducer, purgeStoredState } from 'redux-persist';
import storage from 'redux-persist/lib/storage';
import { createTableStateReducers } from 'store/tableState.reducer';
+import t from 'store/types';
const initialState = {
tableState: {
@@ -12,17 +13,20 @@ const initialState = {
selectedRows: [],
};
-const reducerInstance = createReducer(initialState, {
- ...createTableStateReducers('INVENTORY_ADJUSTMENTS'),
-});
-
const STORAGE_KEY = 'bigcapital:inventoryAdjustments';
-export default persistReducer(
- {
- key: STORAGE_KEY,
- whitelist: ['tableState'],
- storage,
+const CONFIG = {
+ key: STORAGE_KEY,
+ whitelist: ['tableState'],
+ storage,
+};
+
+const reducerInstance = createReducer(initialState, {
+ ...createTableStateReducers('INVENTORY_ADJUSTMENTS'),
+
+ [t.RESET]: () => {
+ purgeStoredState(CONFIG);
},
- reducerInstance,
-);
+});
+
+export default persistReducer(CONFIG, reducerInstance);
diff --git a/client/src/store/itemCategories/itemsCategory.reducer.js b/client/src/store/itemCategories/itemsCategory.reducer.js
index bb15a35dc..fb0d90b3a 100644
--- a/client/src/store/itemCategories/itemsCategory.reducer.js
+++ b/client/src/store/itemCategories/itemsCategory.reducer.js
@@ -1,27 +1,33 @@
import { createReducer } from '@reduxjs/toolkit';
-import { persistReducer } from 'redux-persist';
+import { persistReducer, purgeStoredState } from 'redux-persist';
import storage from 'redux-persist/lib/storage';
import {
createTableStateReducers,
} from 'store/tableState.reducer';
+import t from 'store/types';
// Initial state.
const initialState = {
tableState: {},
};
-const reducerInstance = createReducer(initialState, {
- ...createTableStateReducers('ITEMS_CATEGORIES'),
-});
-
-
const STORAGE_KEY = 'bigcapital:itemCategories';
-export default persistReducer(
- {
- key: STORAGE_KEY,
- whitelist: ['tableState'],
- storage,
+const CONFIG = {
+ key: STORAGE_KEY,
+ whitelist: ['tableState'],
+ storage,
+};
+
+const reducerInstance = createReducer(initialState, {
+ ...createTableStateReducers('ITEMS_CATEGORIES'),
+
+ [t.RESET]: () => {
+ purgeStoredState(CONFIG);
},
+});
+
+export default persistReducer(
+ CONFIG,
reducerInstance,
);
diff --git a/client/src/store/items/items.reducer.js b/client/src/store/items/items.reducer.js
index 0c60a7c43..c8d48cd02 100644
--- a/client/src/store/items/items.reducer.js
+++ b/client/src/store/items/items.reducer.js
@@ -1,7 +1,8 @@
import { createReducer } from '@reduxjs/toolkit';
-import { persistReducer } from 'redux-persist';
+import { persistReducer, purgeStoredState } from 'redux-persist';
import storage from 'redux-persist/lib/storage';
import { createTableStateReducers } from 'store/tableState.reducer';
+import t from 'store/types';
const initialState = {
tableState: {
@@ -12,17 +13,23 @@ const initialState = {
selectedRows: [],
};
-const reducerInstance = createReducer(initialState, {
- ...createTableStateReducers('ITEMS'),
-});
-
const STORAGE_KEY = 'bigcapital:items';
-export default persistReducer(
- {
- key: STORAGE_KEY,
- whitelist: ['tableState'],
- storage,
+const CONFIG = {
+ key: STORAGE_KEY,
+ whitelist: ['tableState'],
+ storage,
+};
+
+const reducerInstance = createReducer(initialState, {
+ ...createTableStateReducers('ITEMS'),
+
+ [t.RESET]: () => {
+ purgeStoredState(CONFIG);
},
+});
+
+export default persistReducer(
+ CONFIG,
reducerInstance,
);
\ No newline at end of file
diff --git a/client/src/store/manualJournals/manualJournals.reducers.js b/client/src/store/manualJournals/manualJournals.reducers.js
index 2cfd009e0..b041a63f4 100644
--- a/client/src/store/manualJournals/manualJournals.reducers.js
+++ b/client/src/store/manualJournals/manualJournals.reducers.js
@@ -1,7 +1,8 @@
import { createReducer } from '@reduxjs/toolkit';
-import { persistReducer } from 'redux-persist';
+import { persistReducer, purgeStoredState } from 'redux-persist';
import storage from 'redux-persist/lib/storage';
import { createTableStateReducers } from 'store/tableState.reducer';
+import t from 'store/types';
const initialState = {
tableState: {
@@ -10,17 +11,20 @@ const initialState = {
},
};
-const reducerInstance = createReducer(initialState, {
- ...createTableStateReducers('MANUAL_JOURNALS'),
-});
-
const STORAGE_KEY = 'bigcapital:manualJournals';
-export default persistReducer(
- {
- key: STORAGE_KEY,
- whitelist: ['tableState'],
- storage,
+const CONFIG = {
+ key: STORAGE_KEY,
+ whitelist: ['tableState'],
+ storage,
+};
+
+const reducerInstance = createReducer(initialState, {
+ ...createTableStateReducers('MANUAL_JOURNALS'),
+
+ [t.RESET]: () => {
+ purgeStoredState(CONFIG);
},
- reducerInstance,
-);
+});
+
+export default persistReducer(CONFIG, reducerInstance);
diff --git a/client/src/store/organizations/organizations.reducers.js b/client/src/store/organizations/organizations.reducers.js
index 6fa8a44e0..9dfa28f20 100644
--- a/client/src/store/organizations/organizations.reducers.js
+++ b/client/src/store/organizations/organizations.reducers.js
@@ -14,7 +14,10 @@ const reducer = createReducer(initialState, {
const _dataByOrganizationId = {};
organizations.forEach((organization) => {
- _data[organization.id] = organization;
+ _data[organization.id] = {
+ ...state.data[organization.id],
+ ...organization,
+ };
_dataByOrganizationId[organization.organization_id] = organization.id;
});
state.data = _data;
diff --git a/client/src/store/organizations/withSetupWizard.js b/client/src/store/organizations/withSetupWizard.js
index 19a265244..d0121bd5c 100644
--- a/client/src/store/organizations/withSetupWizard.js
+++ b/client/src/store/organizations/withSetupWizard.js
@@ -6,16 +6,28 @@ export default (mapState) => {
isOrganizationSetupCompleted,
isOrganizationInitialized,
isOrganizationSeeded,
-
isSubscriptionActive
} = props;
- const mapped = {
+ const condits = {
isCongratsStep: isOrganizationSetupCompleted,
isSubscriptionStep: !isSubscriptionActive,
isInitializingStep: isSubscriptionActive && !isOrganizationInitialized,
isOrganizationStep: isOrganizationInitialized && !isOrganizationSeeded,
};
+
+ const scenarios = [
+ { condition: condits.isCongratsStep, step: 'congrats' },
+ { condition: condits.isSubscriptionStep, step: 'subscription' },
+ { condition: condits.isInitializingStep, step: 'initializing' },
+ { condition: condits.isOrganizationStep, step: 'organization' },
+ ];
+ const setupStep = scenarios.find((scenario) => scenario.condition);
+ const mapped = {
+ ...condits,
+ setupStepId: setupStep?.step,
+ setupStepIndex: scenarios.indexOf(setupStep) ,
+ };
return mapState ? mapState(mapped, state, props) : mapped;
};
return connect(mapStateToProps);
diff --git a/client/src/store/receipts/receipts.reducer.js b/client/src/store/receipts/receipts.reducer.js
index de3b218d3..5401eb97a 100644
--- a/client/src/store/receipts/receipts.reducer.js
+++ b/client/src/store/receipts/receipts.reducer.js
@@ -1,9 +1,10 @@
import { createReducer } from '@reduxjs/toolkit';
-import { persistReducer } from 'redux-persist';
+import { persistReducer, purgeStoredState } from 'redux-persist';
import storage from 'redux-persist/lib/storage';
import {
createTableStateReducers,
} from 'store/tableState.reducer';
+import t from 'store/types';
const initialState = {
tableState: {
@@ -11,18 +12,24 @@ const initialState = {
pageIndex: 0,
},
};
-
-const reducerInstance = createReducer(initialState, {
- ...createTableStateReducers('RECEIPTS'),
-});
const STORAGE_KEY = 'bigcapital:receipts';
-export default persistReducer(
- {
- key: STORAGE_KEY,
- whitelist: ['tableState'],
- storage,
+const CONFIG = {
+ key: STORAGE_KEY,
+ whitelist: ['tableState'],
+ storage,
+};
+
+const reducerInstance = createReducer(initialState, {
+ ...createTableStateReducers('RECEIPTS'),
+
+ [t.RESET]: () => {
+ purgeStoredState(CONFIG);
},
+});
+
+export default persistReducer(
+ CONFIG,
reducerInstance,
);
diff --git a/client/src/store/settings/settings.reducer.js b/client/src/store/settings/settings.reducer.js
index d837ab1dd..3b25af410 100644
--- a/client/src/store/settings/settings.reducer.js
+++ b/client/src/store/settings/settings.reducer.js
@@ -1,11 +1,11 @@
import { camelCase } from 'lodash';
import { createReducer } from '@reduxjs/toolkit';
import t from 'store/types';
-import { optionsArrayToMap } from 'utils';
+
const initialState = {
data: {
organization: {
- name: 'Bigcapital, Limited Liabilities',
+ name: 'Bigcapital, LLC',
},
manualJournals: {},
bills: {},
diff --git a/client/src/store/subscription/subscription.actions.js b/client/src/store/subscription/subscription.actions.js
index bd765a782..161a2684e 100644
--- a/client/src/store/subscription/subscription.actions.js
+++ b/client/src/store/subscription/subscription.actions.js
@@ -21,4 +21,5 @@ export const setSubscriptions = (subscriptions) => {
subscriptions,
},
}
-};
\ No newline at end of file
+};
+
diff --git a/client/src/store/vendors/vendors.reducer.js b/client/src/store/vendors/vendors.reducer.js
index 74412377e..2db324950 100644
--- a/client/src/store/vendors/vendors.reducer.js
+++ b/client/src/store/vendors/vendors.reducer.js
@@ -1,9 +1,8 @@
import { createReducer } from '@reduxjs/toolkit';
-import { persistReducer } from 'redux-persist';
+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';
const initialState = {
tableState: {
@@ -11,17 +10,21 @@ const initialState = {
pageIndex: 0,
},
};
-const reducerInstance = createReducer(initialState, {
- ...createTableStateReducers('VENDORS'),
-});
const STORAGE_KEY = 'bigcapital:vendors';
-export default persistReducer(
- {
- key: STORAGE_KEY,
- whitelist: ['tableState'],
- storage,
- },
- reducerInstance,
-);
+const CONFIG = {
+ key: STORAGE_KEY,
+ whitelist: ['tableState'],
+ storage,
+};
+
+const reducerInstance = createReducer(initialState, {
+ ...createTableStateReducers('VENDORS'),
+
+ [t.RESET]: () => {
+ purgeStoredState(CONFIG);
+ }
+});
+
+export default persistReducer(CONFIG, reducerInstance);
diff --git a/client/src/style/pages/Setup/Organization.scss b/client/src/style/pages/Setup/Organization.scss
index 67f43d203..82defab18 100644
--- a/client/src/style/pages/Setup/Organization.scss
+++ b/client/src/style/pages/Setup/Organization.scss
@@ -13,7 +13,7 @@
color: #565e6c;
}
.paragraph {
- opacity: 0.75;
+ opacity: 0.8;
}
}
@@ -38,6 +38,10 @@
}
}
+ label.bp3-label{
+ color: #313744;
+ }
+
.form-group--language {
margin-left: 10px;
}
diff --git a/client/src/style/pages/Subscription/PlanPeriodRadio.scss b/client/src/style/pages/Subscription/PlanPeriodRadio.scss
index 186d11e85..2332f71a6 100644
--- a/client/src/style/pages/Subscription/PlanPeriodRadio.scss
+++ b/client/src/style/pages/Subscription/PlanPeriodRadio.scss
@@ -30,7 +30,7 @@
font-weight: 600;
}
&__period{
- color: #666;
+ color: #2f3863;
font-size: 14px;
font-weight: 500;
diff --git a/client/src/style/pages/Subscription/PlanRadio.scss b/client/src/style/pages/Subscription/PlanRadio.scss
index 5615bd53a..ba8c85d45 100644
--- a/client/src/style/pages/Subscription/PlanRadio.scss
+++ b/client/src/style/pages/Subscription/PlanRadio.scss
@@ -60,7 +60,7 @@
}
&__period {
font-weight: 400;
- color: #666;
+ color: #2f3863;
&::before {
content: '/';
diff --git a/server/src/api/controllers/Subscription/PaymentViaLicense.ts b/server/src/api/controllers/Subscription/PaymentViaLicense.ts
index 45b219c53..9e8e083c2 100644
--- a/server/src/api/controllers/Subscription/PaymentViaLicense.ts
+++ b/server/src/api/controllers/Subscription/PaymentViaLicense.ts
@@ -8,8 +8,10 @@ import {
NoPaymentModelWithPricedPlan,
PaymentAmountInvalidWithPlan,
PaymentInputInvalid,
+ VoucherCodeRequired
} from 'exceptions';
import { ILicensePaymentModel } from 'interfaces';
+import instance from 'tsyringe/dist/typings/dependency-container';
@Service()
export default class PaymentViaLicenseController extends PaymentMethodController {
@@ -67,6 +69,11 @@ export default class PaymentViaLicenseController extends PaymentMethodController
} catch (exception) {
const errorReasons = [];
+ if (exception instanceof VoucherCodeRequired) {
+ errorReasons.push({
+ type: 'VOUCHER_CODE_REQUIRED', code: 100,
+ });
+ }
if (exception instanceof NoPaymentModelWithPricedPlan) {
errorReasons.push({
type: 'NO_PAYMENT_WITH_PRICED_PLAN',
diff --git a/server/src/api/index.ts b/server/src/api/index.ts
index 4d6cf32f4..5b4fd7d9d 100644
--- a/server/src/api/index.ts
+++ b/server/src/api/index.ts
@@ -56,6 +56,7 @@ export default () => {
app.use('/organization', Container.get(Organization).router());
app.use('/ping', Container.get(Ping).router());
app.use('/setup', Container.get(Setup).router());
+
// - Dashboard routes.
// ---------------------------
const dashboard = Router();