diff --git a/packages/webapp/src/components/DialogsContainer.tsx b/packages/webapp/src/components/DialogsContainer.tsx index c603a624f..5c753c213 100644 --- a/packages/webapp/src/components/DialogsContainer.tsx +++ b/packages/webapp/src/components/DialogsContainer.tsx @@ -51,6 +51,7 @@ import EstimateMailDialog from '@/containers/Sales/Estimates/EstimateMailDialog/ import ReceiptMailDialog from '@/containers/Sales/Receipts/ReceiptMailDialog/ReceiptMailDialog'; import PaymentMailDialog from '@/containers/Sales/PaymentReceives/PaymentMailDialog/PaymentMailDialog'; import { ExportDialog } from '@/containers/Dialogs/ExportDialog'; +import { RuleFormDialog } from '@/containers/Banking/Rules/RuleFormDialog/RuleFormDialog'; /** * Dialogs container. @@ -147,6 +148,7 @@ export default function DialogsContainer() { + ); } diff --git a/packages/webapp/src/constants/dialogs.ts b/packages/webapp/src/constants/dialogs.ts index cd425ce58..07ed83d67 100644 --- a/packages/webapp/src/constants/dialogs.ts +++ b/packages/webapp/src/constants/dialogs.ts @@ -75,4 +75,5 @@ export enum DialogsName { GeneralLedgerPdfPreview = 'GeneralLedgerPdfPreview', SalesTaxLiabilitySummaryPdfPreview = 'SalesTaxLiabilitySummaryPdfPreview', Export = 'Export', + BankRuleForm = 'BankRuleForm' } diff --git a/packages/webapp/src/containers/Banking/Rules/RuleFormDialog/RuleForm.tsx b/packages/webapp/src/containers/Banking/Rules/RuleFormDialog/RuleForm.tsx deleted file mode 100644 index e69de29bb..000000000 diff --git a/packages/webapp/src/containers/Banking/Rules/RuleFormDialog/RuleFormContent.tsx b/packages/webapp/src/containers/Banking/Rules/RuleFormDialog/RuleFormContent.tsx index e96b1d500..6f8e6d9b1 100644 --- a/packages/webapp/src/containers/Banking/Rules/RuleFormDialog/RuleFormContent.tsx +++ b/packages/webapp/src/containers/Banking/Rules/RuleFormDialog/RuleFormContent.tsx @@ -1,19 +1,20 @@ -import { RuleFormBoot } from "./RuleFormBoot"; - +import { RuleFormBoot } from './RuleFormBoot'; +import { RuleFormContentForm } from './RuleFormContentForm'; interface RuleFormContentProps { dialogName: string; bankRuleId?: number; } -export function RuleFormContent({ + +export default function RuleFormContent({ dialogName, bankRuleId, }: RuleFormContentProps) { return ( - - - +
+ + + +
); } diff --git a/packages/webapp/src/containers/Banking/Rules/RuleFormDialog/RuleFormContentForm.tsx b/packages/webapp/src/containers/Banking/Rules/RuleFormDialog/RuleFormContentForm.tsx index a018fe9df..230f0ed74 100644 --- a/packages/webapp/src/containers/Banking/Rules/RuleFormDialog/RuleFormContentForm.tsx +++ b/packages/webapp/src/containers/Banking/Rules/RuleFormDialog/RuleFormContentForm.tsx @@ -1,5 +1,5 @@ import { Form, Formik, useFormikContext } from 'formik'; -import { Button, Radio } from '@blueprintjs/core'; +import { Button, Classes, Intent, Radio } from '@blueprintjs/core'; import { CreateRuleFormSchema } from './RuleFormContentForm.schema'; import { Box, @@ -61,7 +61,10 @@ export function RuleFormContentForm() { - + -

Then Assign

@@ -86,6 +88,8 @@ export function RuleFormContentForm() { + + ); @@ -132,3 +136,25 @@ function RuleFormConditions() { ); } + +function RuleFormActions() { + const { isSubmitting, submitForm } = useFormikContext(); + + const handleSaveBtnClick = () => { + submitForm(); + }; + const handleCancelBtnClick = () => {}; + + return ( + + + + + ); +} diff --git a/packages/webapp/src/containers/Banking/Rules/RuleFormDialog/RuleFormDialog.tsx b/packages/webapp/src/containers/Banking/Rules/RuleFormDialog/RuleFormDialog.tsx index 5fa6929f7..262f1576a 100644 --- a/packages/webapp/src/containers/Banking/Rules/RuleFormDialog/RuleFormDialog.tsx +++ b/packages/webapp/src/containers/Banking/Rules/RuleFormDialog/RuleFormDialog.tsx @@ -9,14 +9,14 @@ const RuleFormContent = React.lazy(() => import('./RuleFormContent')); /** * Payment mail dialog. */ -function RuleFormDialog({ +function RuleFormDialogRoot({ dialogName, payload: { bankRuleId = null }, isOpen, }) { return ( { + openDialog(DialogsName.BankRuleForm); + }; -export function RulesListActionsBar() { return ( - + + +