QT/bigcapital
1
0
Fork 0
mirror of https://github.com/bigcapitalhq/bigcapital.git synced 2026-02-16 12:50:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://github.com/bigcapitalhq/client into develop

Browse Source
This commit is contained in:
a.bouhuolia
2021-12-13 15:23:49 +02:00
parent a6a10ef6b8 fba46e2479
commit 51dfee699f
13 changed files with 61 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/containers/Dialogs/LockingTransactionsDialog/LockingTransactionsDialogContent.js
View File

@@ -8,9 +8,10 @@ import LockingTransactionsForm from './LockingTransactionsForm';
export default function LockingTransactionsDialogContent({
// #ownProps
dialogName,
moduleName,
}) {
return (
<LockingTransactionsFormProvider dialogName={dialogName}>
<LockingTransactionsFormProvider moduleName={moduleName} dialogName={dialogName}>
<LockingTransactionsForm />
</LockingTransactionsFormProvider>
);

5
src/containers/Dialogs/LockingTransactionsDialog/LockingTransactionsForm.js
View File

@@ -16,7 +16,7 @@ import withDialogActions from 'containers/Dialog/withDialogActions';
import { compose } from 'utils';
const defaultInitialValues = {
module: 'all',
module: '',
lock_to_date: moment(new Date()).format('YYYY-MM-DD'),
reason: '',
};
@@ -28,12 +28,13 @@ function LockingTransactionsForm({
// #withDialogActions
closeDialog,
}) {
const { dialogName, createLockingTransactionMutate } =
const { dialogName, moduleName, createLockingTransactionMutate } =
useLockingTransactionsContext();
// Initial form values.
const initialValues = {
...defaultInitialValues,
module: moduleName,
};
// Handles the form submit.

6
src/containers/Dialogs/LockingTransactionsDialog/LockingTransactionsFormProvider.js
View File

@@ -7,15 +7,15 @@ const LockingTransactionsContext = React.createContext();
/**
* Locking transactions form provider.
*/
function LockingTransactionsFormProvider({ dialogName, ...props }) {
function LockingTransactionsFormProvider({ moduleName, dialogName, ...props }) {
// Create locking transactions mutations.
const { mutateAsync: createLockingTransactionMutate } =
useCreateLockingTransactoin();
useCreateLockingTransactoin();
// State provider.
const provider = {
dialogName,
moduleName,
createLockingTransactionMutate,
};
return (

11
src/containers/Dialogs/LockingTransactionsDialog/index.js
View File

@@ -10,7 +10,11 @@ const LockingTransactionsDialogContent = React.lazy(() =>
/**
* Locking Transactions dialog
*/
function LockingTransactionsDialog({ dialogName, payload = {}, isOpen }) {
function LockingTransactionsDialog({
dialogName,
payload: { module },
isOpen,
}) {
return (
<Dialog
name={dialogName}
@@ -21,7 +25,10 @@ function LockingTransactionsDialog({ dialogName, payload = {}, isOpen }) {
className={'dialog--transaction--locking'}
>
<DialogSuspense>
<LockingTransactionsDialogContent dialogName={dialogName} />
<LockingTransactionsDialogContent
moduleName={module}
dialogName={dialogName}
/>
</DialogSuspense>
</Dialog>
);

6
src/containers/Dialogs/UnlockingPartialTransactionsDialog/UnlockingPartialTransactionsDialogContent.js
View File

@@ -8,10 +8,14 @@ import UnlockingPartialTransactionsForm from './UnlockingPartialTransactionsForm
*/
export default function UnlockingPartialTransactionsDialogContent({
// #ownProps
moduleName,
dialogName,
}) {
return (
<UnlockingPartialTransactionsFormProvider dialogName={dialogName}>
<UnlockingPartialTransactionsFormProvider
moduleName={moduleName}
dialogName={dialogName}
>
<UnlockingPartialTransactionsForm />
</UnlockingPartialTransactionsFormProvider>
);

5
src/containers/Dialogs/UnlockingPartialTransactionsDialog/UnlockingPartialTransactionsForm.js
View File

@@ -16,7 +16,7 @@ import withDialogActions from 'containers/Dialog/withDialogActions';
import { compose } from 'utils';
const defaultInitialValues = {
module: 'all',
module: '',
unlock_from_date: moment(new Date()).format('YYYY-MM-DD'),
unlock_to_date: moment(new Date()).format('YYYY-MM-DD'),
reason: '',
@@ -29,12 +29,13 @@ function UnlockingPartialTransactionsForm({
// #withDialogActions
closeDialog,
}) {
const { dialogName, createUnlockingPartialTransactionsMutate } =
const { dialogName, moduleName, createUnlockingPartialTransactionsMutate } =
useUnlockingPartialTransactionsContext();
// Initial form values.
const initialValues = {
...defaultInitialValues,
module: moduleName,
};
// Handles the form submit.

7
src/containers/Dialogs/UnlockingPartialTransactionsDialog/UnlockingPartialTransactionsFormProvider.js
View File

@@ -7,7 +7,11 @@ const UnlockingPartialTransactionsContext = React.createContext();
/**
* Unlocking partial transactions form provider.
*/
function UnlockingPartialTransactionsFormProvider({ dialogName, ...props }) {
function UnlockingPartialTransactionsFormProvider({
moduleName,
dialogName,
...props
}) {
// Create unlocking partial transactions mutations.
const { mutateAsync: createUnlockingPartialTransactionsMutate } =
useCreateUnlockingPartialTransactions();
@@ -15,6 +19,7 @@ function UnlockingPartialTransactionsFormProvider({ dialogName, ...props }) {
// State provider.
const provider = {
dialogName,
moduleName,
createUnlockingPartialTransactionsMutate,
};

7
src/containers/Dialogs/UnlockingPartialTransactionsDialog/index.js
View File

@@ -13,7 +13,7 @@ const UnlockingPartialTransactionsDialogContent = React.lazy(() =>
function UnLockingPartialTransactionsDilaog({
isOpen,
dialogName,
payload = {},
payload: { module },
}) {
return (
<Dialog
@@ -25,7 +25,10 @@ function UnLockingPartialTransactionsDilaog({
className={'dialog--transaction--locking'}
>
<DialogSuspense>
<UnlockingPartialTransactionsDialogContent dialogName={dialogName} />
<UnlockingPartialTransactionsDialogContent
moduleName={module}
dialogName={dialogName}
/>
</DialogSuspense>
</Dialog>
);

3
src/containers/Dialogs/UnlockingTransactionsDialog/UnlockingTransactionsDialogContent.js
View File

@@ -5,10 +5,11 @@ import { UnlockingTransactionsFormProvider } from './UnlockingTransactionsFormPr
export default function UnlockingTransactionsDialogContent({
// #ownProps
moduleName,
dialogName,
}) {
return (
<UnlockingTransactionsFormProvider dialogName={dialogName}>
<UnlockingTransactionsFormProvider moduleName={moduleName} dialogName={dialogName}>
<UnlockingTransactionsForm />
</UnlockingTransactionsFormProvider>
);

4
src/containers/Dialogs/UnlockingTransactionsDialog/UnlockingTransactionsForm.js
View File

@@ -15,7 +15,7 @@ import withDialogActions from 'containers/Dialog/withDialogActions';
import { compose } from 'utils';
const defaultInitialValues = {
module: 'all',
module: '',
reason: '',
};
@@ -28,6 +28,7 @@ function UnlockingTransactionsForm({
}) {
const {
dialogName,
moduleName,
cancelLockingTransactionMutate,
cancelUnLockingPartialTransactionMutate,
} = useUnlockingTransactionsContext();
@@ -35,6 +36,7 @@ function UnlockingTransactionsForm({
// Initial form values.
const initialValues = {
...defaultInitialValues,
module: moduleName,
};
// Handles the form submit.

3
src/containers/Dialogs/UnlockingTransactionsDialog/UnlockingTransactionsFormProvider.js
View File

@@ -10,7 +10,7 @@ const UnlockingTransactionsContext = React.createContext();
/**
* Unlocking transactions form provider.
*/
function UnlockingTransactionsFormProvider({ dialogName, ...props }) {
function UnlockingTransactionsFormProvider({ moduleName, dialogName, ...props }) {
// Cancle locking transactions mutations.
const { mutateAsync: cancelLockingTransactionMutate } =
useCancelLockingTransaction();
@@ -22,6 +22,7 @@ function UnlockingTransactionsFormProvider({ dialogName, ...props }) {
// State provider.
const provider = {
dialogName,
moduleName,
cancelLockingTransactionMutate,
cancelUnLockingPartialTransactionMutate,
};

11
src/containers/Dialogs/UnlockingTransactionsDialog/index.js
View File

@@ -10,7 +10,11 @@ const UnlockingTransactionsDialogContent = React.lazy(() =>
/**
* Unlocking transactions dialog.
*/
function UnlockingTransactionsDialog({ dialogName, payload = {}, isOpen }) {
function UnlockingTransactionsDialog({
dialogName,
payload: { module },
isOpen,
}) {
return (
<Dialog
name={dialogName}
@@ -21,7 +25,10 @@ function UnlockingTransactionsDialog({ dialogName, payload = {}, isOpen }) {
className={'dialog--transaction--locking'}
>
<DialogSuspense>
<UnlockingTransactionsDialogContent dialogName={dialogName} />
<UnlockingTransactionsDialogContent
moduleName={module}
dialogName={dialogName}
/>
</DialogSuspense>
</Dialog>
);

17
src/containers/TransactionsLocking/TransactionsLockingList.js
View File

@@ -18,14 +18,15 @@ function Paragraph({ className, children }) {
}
function TransactionsLockingList({ items, onlock, onUnlock, onUnlockPartial }) {
return items.map(({ is_enabled, formatted_module, description }) => (
return items.map(({ is_enabled, module, formatted_module, description }) => (
<TransactionLockingContent
name={formatted_module}
module={module}
description={description}
isEnabled={is_enabled}
onLock={onlock}
onUnlockPartial={onUnlockPartial}
onEditLock={onUnlock}
onEditLock={onlock}
/>
));
}
@@ -108,17 +109,17 @@ function TransactionsLockingBodyJsx({
} = useTransactionsLockingContext();
// Handle locking transactions.
const handleLockingTransactions = () => {
openDialog('locking-transactions', {});
const handleLockingTransactions = (module) => {
openDialog('locking-transactions', { module: module });
};
// Handle unlocking transactions
const handleUnlockTransactions = () => {
openDialog('unlocking-transactions', {});
const handleUnlockTransactions = (module) => {
openDialog('unlocking-transactions', { module: module });
};
// Handle unlocking transactions
const handleUnlockingPartial = () => {
openDialog('unlocking-partial-transactions', {});
const handleUnlockingPartial = (module) => {
openDialog('unlocking-partial-transactions', { module: module });
};
return !isTransactionLockingLoading ? (