QT/bigcapital
1
0
Fork 0
mirror of https://github.com/bigcapitalhq/bigcapital.git synced 2026-02-20 06:40:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: BIG-352 Add terms and conditions/notes field to a warehouse transfer.

Browse Source
This commit is contained in:
a.bouhuolia
2022-03-28 19:06:38 +02:00
parent d842722183
commit 767d807490
10 changed files with 80 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/containers/Sales/CreditNotes/CreditNoteForm/CreditNoteFormFooterLeft.js
View File

@@ -10,7 +10,6 @@ export function CreditNoteFormFooterLeft() {
<CreditNoteMsgFormGroup
name={'note'}
label={<T id={'credit_note.label_customer_note'} />}
hintText={'Will be displayed on the invoice'}
>
<FEditableText
name={'note'}
@@ -24,9 +23,9 @@ export function CreditNoteFormFooterLeft() {
>
<FEditableText
name={'terms_conditions'}
placeholder={
<T id={'credit_note.label_terms_and_conditions.placeholder'} />
}
placeholder={intl.get(
'credit_note.label_terms_and_conditions.placeholder',
)}
/>
</TermsConditsFormGroup>
</React.Fragment>

3
src/containers/Sales/Invoices/InvoiceForm/InvoiceFormFooterLeft.js
View File

@@ -10,7 +10,6 @@ export function InvoiceFormFooterLeft() {
<InvoiceMsgFormGroup
name={'invoice_message'}
label={<T id={'invoice_message'} />}
hintText={'Will be displayed on the invoice'}
>
<FEditableText
name={'invoice_message'}
@@ -20,7 +19,7 @@ export function InvoiceFormFooterLeft() {
{/* --------- Terms and conditions --------- */}
<TermsConditsFormGroup
label={<T id={'invoice_form.label.invoice_message'} />}
label={<T id={'invoice_form.label.terms_conditions'} />}
name={'terms_conditions'}
>
<FEditableText

36
src/containers/Sales/PaymentReceives/PaymentReceiveForm/PaymentReceiveFormFootetLeft.js
View File

@@ -7,14 +7,24 @@ export function PaymentReceiveFormFootetLeft() {
return (
<React.Fragment>
{/* --------- Statement--------- */}
<TermsConditsFormGroup
name={'statement'}
label={<T id={'payment_receive_form.label.statement'} />}
hintText={'Will be displayed on the Payment'}
<PaymentMsgFormGroup
name={'message'}
label={<T id={'payment_receive_form.message.label'} />}
>
<FEditableText
name={'statement'}
placeholder={intl.get('payment_receive_form.statement.placeholder')}
name={'message'}
placeholder={intl.get('payment_receive_form.message.placeholder')}
/>
</PaymentMsgFormGroup>
{/* --------- Internal Note--------- */}
<TermsConditsFormGroup
name={'internal_note'}
label={<T id={'payment_receive_form.label.internal_note'} />}
>
<FEditableText
name={'internal_note'}
placeholder={intl.get('payment_receive_form.internal_note.placeholder')}
/>
</TermsConditsFormGroup>
</React.Fragment>
@@ -32,3 +42,17 @@ const TermsConditsFormGroup = styled(FFormGroup)`
}
}
`;
const PaymentMsgFormGroup = styled(FFormGroup)`
&.bp3-form-group {
margin-bottom: 40px;
.bp3-label {
font-size: 12px;
margin-bottom: 12px;
}
.bp3-form-content {
margin-left: 10px;
}
}
`;