diff --git a/src/containers/Purchases/Bills/BillForm/BillFormFooter.js b/src/containers/Purchases/Bills/BillForm/BillFormFooter.js
index 3f0259b0c..de86f2f5f 100644
--- a/src/containers/Purchases/Bills/BillForm/BillFormFooter.js
+++ b/src/containers/Purchases/Bills/BillForm/BillFormFooter.js
@@ -1,43 +1,31 @@
import React from 'react';
-import { FormGroup, TextArea } from '@blueprintjs/core';
-import { FormattedMessage as T } from 'components';
-import { FastField } from 'formik';
import classNames from 'classnames';
-import { Postbox, Row, Col } from 'components';
+import styled from 'styled-components';
+
import { CLASSES } from 'common/classes';
-import Dragzone from 'components/Dragzone';
-import { inputIntent } from 'utils';
+import { Paper, Row, Col } from 'components';
+import { BillFormFooterLeft } from './BillFormFooterLeft';
+import { BillFormFooterRight } from './BillFormFooterRight';
// Bill form floating actions.
export default function BillFormFooter() {
return (
);
}
+
+const BillFooterPaper = styled(Paper)`
+ padding: 20px;
+`;
diff --git a/src/containers/Purchases/Bills/BillForm/BillFormFooterLeft.js b/src/containers/Purchases/Bills/BillForm/BillFormFooterLeft.js
new file mode 100644
index 000000000..fb827ead2
--- /dev/null
+++ b/src/containers/Purchases/Bills/BillForm/BillFormFooterLeft.js
@@ -0,0 +1,31 @@
+import React from 'react';
+import styled from 'styled-components';
+import { FFormGroup, FEditableText, FormattedMessage as T } from 'components';
+
+export function BillFormFooterLeft() {
+ return (
+
+ {/* --------- note --------- */}
+ } name={'note'}>
+
+
+
+ );
+}
+
+const TermsConditsFormGroup = styled(FFormGroup)`
+ &.bp3-form-group {
+ .bp3-label {
+ font-size: 12px;
+ margin-bottom: 12px;
+ }
+ .bp3-form-content {
+ margin-left: 10px;
+ }
+ }
+`;
diff --git a/src/containers/Purchases/Bills/BillForm/BillFormFooterRight.js b/src/containers/Purchases/Bills/BillForm/BillFormFooterRight.js
new file mode 100644
index 000000000..f5f5b385e
--- /dev/null
+++ b/src/containers/Purchases/Bills/BillForm/BillFormFooterRight.js
@@ -0,0 +1,43 @@
+import React from 'react';
+import styled from 'styled-components';
+
+import {
+ T,
+ TotalLines,
+ TotalLine,
+ TotalLineBorderStyle,
+ TotalLineTextStyle,
+} from 'components';
+
+export function BillFormFooterRight() {
+ return (
+
+ }
+ value={'$5000.00'}
+ borderStyle={TotalLineBorderStyle.None}
+ />
+ }
+ value={'$5000.00'}
+ borderStyle={TotalLineBorderStyle.SingleDark}
+ textStyle={TotalLineTextStyle.Bold}
+ />
+ }
+ value={'$0.00'}
+ borderStyle={TotalLineBorderStyle.None}
+ />
+ }
+ value={'$5000.00'}
+ textStyle={TotalLineTextStyle.Bold}
+ />
+
+ );
+}
+
+const BillTotalLines = styled(TotalLines)`
+ width: 100%;
+ color: #555555;
+`;
diff --git a/src/containers/Purchases/CreditNotes/CreditNoteForm/VendorCreditNoteFormFooter.js b/src/containers/Purchases/CreditNotes/CreditNoteForm/VendorCreditNoteFormFooter.js
index 88a99e574..eeebd913b 100644
--- a/src/containers/Purchases/CreditNotes/CreditNoteForm/VendorCreditNoteFormFooter.js
+++ b/src/containers/Purchases/CreditNotes/CreditNoteForm/VendorCreditNoteFormFooter.js
@@ -1,11 +1,11 @@
import React from 'react';
-import { FastField } from 'formik';
-import { FormGroup, TextArea } from '@blueprintjs/core';
-import { FormattedMessage as T } from 'components';
-import { CLASSES } from 'common/classes';
-import { Row, Col, Postbox } from 'components';
-import { inputIntent } from 'utils';
import classNames from 'classnames';
+import styled from 'styled-components';
+
+import { CLASSES } from 'common/classes';
+import { Row, Col, Paper } from 'components';
+import { VendorCreditNoteFormFooterLeft } from './VendorCreditNoteFormFooterLeft';
+import { VendorCreditNoteFormFooterRight } from './VendorCreditNoteFormFooterRight';
/**
* Vendor Credit note form footer.
@@ -13,26 +13,21 @@ import classNames from 'classnames';
export default function VendorCreditNoteFormFooter() {
return (
);
}
+
+const VendorCreditNoteFooterPaper = styled(Paper)`
+ padding: 20px;
+`;
diff --git a/src/containers/Purchases/CreditNotes/CreditNoteForm/VendorCreditNoteFormFooterLeft.js b/src/containers/Purchases/CreditNotes/CreditNoteForm/VendorCreditNoteFormFooterLeft.js
new file mode 100644
index 000000000..835900052
--- /dev/null
+++ b/src/containers/Purchases/CreditNotes/CreditNoteForm/VendorCreditNoteFormFooterLeft.js
@@ -0,0 +1,31 @@
+import React from 'react';
+import styled from 'styled-components';
+import { FFormGroup, FEditableText, FormattedMessage as T } from 'components';
+
+export function VendorCreditNoteFormFooterLeft() {
+ return (
+
+ {/* --------- Terms and conditions --------- */}
+ } name={'note'}>
+
+
+
+ );
+}
+
+const TermsConditsFormGroup = styled(FFormGroup)`
+ &.bp3-form-group {
+ .bp3-label {
+ font-size: 12px;
+ margin-bottom: 12px;
+ }
+ .bp3-form-content {
+ margin-left: 10px;
+ }
+ }
+`;
diff --git a/src/containers/Purchases/CreditNotes/CreditNoteForm/VendorCreditNoteFormFooterRight.js b/src/containers/Purchases/CreditNotes/CreditNoteForm/VendorCreditNoteFormFooterRight.js
new file mode 100644
index 000000000..f85aa8acd
--- /dev/null
+++ b/src/containers/Purchases/CreditNotes/CreditNoteForm/VendorCreditNoteFormFooterRight.js
@@ -0,0 +1,35 @@
+import React from 'react';
+import styled from 'styled-components';
+import {
+ T,
+ TotalLines,
+ TotalLine,
+ TotalLineBorderStyle,
+ TotalLineTextStyle,
+} from 'components';
+
+export function VendorCreditNoteFormFooterRight() {
+ return (
+
+ }
+ value={'$5000.00'}
+ borderStyle={TotalLineBorderStyle.None}
+ />
+ }
+ value={'$5000.00'}
+ // borderStyle={TotalLineBorderStyle.SingleDark}
+ textStyle={TotalLineTextStyle.Bold}
+ />
+
+ );
+}
+
+const VendorCreditNoteTotalLines = styled(TotalLines)`
+ width: 100%;
+ color: #555555;
+`;
diff --git a/src/containers/Purchases/CreditNotes/CreditNoteForm/VendorCreditNoteFormHeaderFields.js b/src/containers/Purchases/CreditNotes/CreditNoteForm/VendorCreditNoteFormHeaderFields.js
index bfe2477e6..3b1b74a94 100644
--- a/src/containers/Purchases/CreditNotes/CreditNoteForm/VendorCreditNoteFormHeaderFields.js
+++ b/src/containers/Purchases/CreditNotes/CreditNoteForm/VendorCreditNoteFormHeaderFields.js
@@ -113,7 +113,6 @@ function VendorCreditNoteFormHeaderFields({
popoverFill={true}
allowCreate={true}
/>
-
)}
diff --git a/src/containers/Purchases/PaymentMades/PaymentForm/PaymentMadeFooter.js b/src/containers/Purchases/PaymentMades/PaymentForm/PaymentMadeFooter.js
index 98dc4522a..c95441891 100644
--- a/src/containers/Purchases/PaymentMades/PaymentForm/PaymentMadeFooter.js
+++ b/src/containers/Purchases/PaymentMades/PaymentForm/PaymentMadeFooter.js
@@ -1,10 +1,11 @@
import React from 'react';
import classNames from 'classnames';
-import { FormGroup, TextArea } from '@blueprintjs/core';
-import { FormattedMessage as T } from 'components';
-import { FastField } from 'formik';
-import { Postbox, Row, Col } from 'components';
+import styled from 'styled-components';
+
import { CLASSES } from 'common/classes';
+import { Row, Col, Paper } from 'components';
+import { PaymentMadeFormFooterLeft } from './PaymentMadeFormFooterLeft';
+import { PaymentMadeFormFooterRight } from './PaymentMadeFormFooterRight';
/**
* Payment made form footer.
@@ -12,23 +13,21 @@ import { CLASSES } from 'common/classes';
export default function PaymentMadeFooter() {
return (
-
} defaultOpen={false}>
+
- {/* --------- Statement --------- */}
-
- {({ form, field, meta: { error, touched } }) => (
- }
- className={'form-group--statement'}
- >
-
-
- )}
-
+
+
+
+
+
-
+
);
}
+
+const PaymentReceiveFooterPaper = styled(Paper)`
+ padding: 20px;
+`;
diff --git a/src/containers/Purchases/PaymentMades/PaymentForm/PaymentMadeFormFooterLeft.js b/src/containers/Purchases/PaymentMades/PaymentForm/PaymentMadeFormFooterLeft.js
new file mode 100644
index 000000000..bd872e7ca
--- /dev/null
+++ b/src/containers/Purchases/PaymentMades/PaymentForm/PaymentMadeFormFooterLeft.js
@@ -0,0 +1,34 @@
+import React from 'react';
+import styled from 'styled-components';
+import { FFormGroup, FEditableText, FormattedMessage as T } from 'components';
+
+export function PaymentMadeFormFooterLeft() {
+ return (
+
+ {/* --------- Statement--------- */}
+ }
+ hintText={'Will be displayed on the Payment'}
+ >
+
+
+
+ );
+}
+const StatementFormGroup = styled(FFormGroup)`
+ &.bp3-form-group {
+ margin-bottom: 40px;
+
+ .bp3-label {
+ font-size: 12px;
+ margin-bottom: 12px;
+ }
+ .bp3-form-content {
+ margin-left: 10px;
+ }
+ }
+`;
diff --git a/src/containers/Purchases/PaymentMades/PaymentForm/PaymentMadeFormFooterRight.js b/src/containers/Purchases/PaymentMades/PaymentForm/PaymentMadeFormFooterRight.js
new file mode 100644
index 000000000..8a6e1b533
--- /dev/null
+++ b/src/containers/Purchases/PaymentMades/PaymentForm/PaymentMadeFormFooterRight.js
@@ -0,0 +1,32 @@
+import React from 'react';
+import styled from 'styled-components';
+import {
+ T,
+ TotalLines,
+ TotalLine,
+ TotalLineBorderStyle,
+ TotalLineTextStyle,
+} from 'components';
+
+export function PaymentMadeFormFooterRight() {
+ return (
+
+ }
+ value={'$5000.00'}
+ borderStyle={TotalLineBorderStyle.None}
+ />
+ }
+ value={'$5000.00'}
+ // borderStyle={TotalLineBorderStyle.SingleDark}
+ textStyle={TotalLineTextStyle.Bold}
+ />
+
+ );
+}
+
+const PaymentMadeTotalLines = styled(TotalLines)`
+ width: 100%;
+ color: #555555;
+`;
diff --git a/src/containers/Purchases/PaymentMades/PaymentForm/PaymentMadeFormHeaderFields.js b/src/containers/Purchases/PaymentMades/PaymentForm/PaymentMadeFormHeaderFields.js
index b190805c3..03074306f 100644
--- a/src/containers/Purchases/PaymentMades/PaymentForm/PaymentMadeFormHeaderFields.js
+++ b/src/containers/Purchases/PaymentMades/PaymentForm/PaymentMadeFormHeaderFields.js
@@ -118,7 +118,6 @@ function PaymentMadeFormHeaderFields({ organization: { base_currency } }) {
popoverFill={true}
allowCreate={true}
/>
-
)}
diff --git a/src/containers/Sales/CreditNotes/CreditNoteForm/CreditNoteFormFooter.js b/src/containers/Sales/CreditNotes/CreditNoteForm/CreditNoteFormFooter.js
index 1bf8cd89c..5d72e918b 100644
--- a/src/containers/Sales/CreditNotes/CreditNoteForm/CreditNoteFormFooter.js
+++ b/src/containers/Sales/CreditNotes/CreditNoteForm/CreditNoteFormFooter.js
@@ -1,11 +1,11 @@
import React from 'react';
-import { FastField } from 'formik';
-import { FormGroup, TextArea } from '@blueprintjs/core';
-import { FormattedMessage as T } from 'components';
-import { CLASSES } from 'common/classes';
-import { Row, Col, Postbox } from 'components';
-import { inputIntent } from 'utils';
import classNames from 'classnames';
+import styled from 'styled-components';
+
+import { CLASSES } from 'common/classes';
+import { Row, Col, Paper } from 'components';
+import { CreditNoteFormFooterLeft } from './CreditNoteFormFooterLeft';
+import { CreditNoteFormFooterRight } from './CreditNoteFormFooterRight';
/**
* Credit note form footer.
@@ -13,39 +13,20 @@ import classNames from 'classnames';
export default function CreditNoteFormFooter() {
return (
-
}
- defaultOpen={false}
- >
+
- {/* --------- Customer notes --------- */}
-
- {({ field, meta: { error, touched } }) => (
- }
- className={'form-group--note'}
- intent={inputIntent({ error, touched })}
- >
-
-
- )}
-
- {/* --------- Terms and conditions --------- */}
-
- {({ field, meta: { error, touched } }) => (
- }
- className={'form-group--terms_conditions'}
- intent={inputIntent({ error, touched })}
- >
-
-
- )}
-
+
+
+
+
+
-
+
);
}
+const CreditNoteFooterPaper = styled(Paper)`
+ padding: 20px;
+`;
diff --git a/src/containers/Sales/CreditNotes/CreditNoteForm/CreditNoteFormFooterLeft.js b/src/containers/Sales/CreditNotes/CreditNoteForm/CreditNoteFormFooterLeft.js
new file mode 100644
index 000000000..ea7849202
--- /dev/null
+++ b/src/containers/Sales/CreditNotes/CreditNoteForm/CreditNoteFormFooterLeft.js
@@ -0,0 +1,59 @@
+import React from 'react';
+import styled from 'styled-components';
+import { FFormGroup, FEditableText, FormattedMessage as T } from 'components';
+
+export function CreditNoteFormFooterLeft() {
+ return (
+
+ {/* --------- Customer notes --------- */}
+ }
+ hintText={'Will be displayed on the invoice'}
+ >
+
+
+ {/* --------- Terms and conditions --------- */}
+ }
+ name={'terms_conditions'}
+ >
+
+
+
+ );
+}
+
+const CreditNoteMsgFormGroup = styled(FFormGroup)`
+ &.bp3-form-group {
+ margin-bottom: 40px;
+
+ .bp3-label {
+ font-size: 12px;
+ margin-bottom: 12px;
+ }
+ .bp3-form-content {
+ margin-left: 10px;
+ }
+ }
+`;
+
+const TermsConditsFormGroup = styled(FFormGroup)`
+ &.bp3-form-group {
+ .bp3-label {
+ font-size: 12px;
+ margin-bottom: 12px;
+ }
+ .bp3-form-content {
+ margin-left: 10px;
+ }
+ }
+`;
diff --git a/src/containers/Sales/CreditNotes/CreditNoteForm/CreditNoteFormFooterRight.js b/src/containers/Sales/CreditNotes/CreditNoteForm/CreditNoteFormFooterRight.js
new file mode 100644
index 000000000..16c702767
--- /dev/null
+++ b/src/containers/Sales/CreditNotes/CreditNoteForm/CreditNoteFormFooterRight.js
@@ -0,0 +1,32 @@
+import React from 'react';
+import styled from 'styled-components';
+import {
+ T,
+ TotalLines,
+ TotalLine,
+ TotalLineBorderStyle,
+ TotalLineTextStyle,
+} from 'components';
+
+export function CreditNoteFormFooterRight() {
+ return (
+
+ }
+ value={'$5000.00'}
+ borderStyle={TotalLineBorderStyle.None}
+ />
+ }
+ value={'$5000.00'}
+ // borderStyle={TotalLineBorderStyle.SingleDark}
+ textStyle={TotalLineTextStyle.Bold}
+ />
+
+ );
+}
+
+const CreditNoteTotalLines = styled(TotalLines)`
+ width: 100%;
+ color: #555555;
+`;
diff --git a/src/containers/Sales/CreditNotes/CreditNoteForm/CreditNoteFormHeaderFields.js b/src/containers/Sales/CreditNotes/CreditNoteForm/CreditNoteFormHeaderFields.js
index a118abfb7..ee8a9f086 100644
--- a/src/containers/Sales/CreditNotes/CreditNoteForm/CreditNoteFormHeaderFields.js
+++ b/src/containers/Sales/CreditNotes/CreditNoteForm/CreditNoteFormHeaderFields.js
@@ -113,7 +113,6 @@ function CreditNoteFormHeaderFields({
popoverFill={true}
allowCreate={true}
/>
-
)}
diff --git a/src/containers/Sales/Estimates/EstimateForm/EstimateFormFooter.js b/src/containers/Sales/Estimates/EstimateForm/EstimateFormFooter.js
index f8c290f3b..9093523cf 100644
--- a/src/containers/Sales/Estimates/EstimateForm/EstimateFormFooter.js
+++ b/src/containers/Sales/Estimates/EstimateForm/EstimateFormFooter.js
@@ -1,60 +1,33 @@
import React from 'react';
-import { FormGroup, TextArea } from '@blueprintjs/core';
-import { FormattedMessage as T } from 'components';
-import { FastField } from 'formik';
import classNames from 'classnames';
-import { CLASSES } from 'common/classes';
-import { Row, Col, Postbox } from 'components';
-import Dragzone from 'components/Dragzone';
+import styled from 'styled-components';
-import { inputIntent } from 'utils';
+import { CLASSES } from 'common/classes';
+import { Row, Col, Paper } from 'components';
+import { EstimateFormFooterLeft } from './EstimateFormFooterLeft';
+import { EstimateFormFooterRight } from './EstimateFormFooterRight';
/**
* Estimate form footer.
*/
-export default function EstiamteFormFooter({}) {
+export default function EstiamteFormFooter() {
return (
-