From 14d1f0bd1dce344ca049e5ec9196a8baf109b3e4 Mon Sep 17 00:00:00 2001 From: Ahmed Bouhuolia Date: Mon, 12 Aug 2024 16:31:36 +0200 Subject: [PATCH] fix: Multi-lines transactions statements --- .../webapp/src/components/Details/index.tsx | 18 +++++++++++++----- .../MakeJournal/MakeJournalFormFooterLeft.tsx | 2 ++ .../Drawers/BillDrawer/BillDetailFooter.tsx | 4 +++- .../CashflowTransactionDrawerFooter.tsx | 5 ++++- .../CreditNoteDetailFooter.tsx | 8 ++++++-- .../EstimateDetailFooter.tsx | 9 ++++++--- .../InvoiceDetailFooter.tsx | 7 +++++-- .../PaymentMadeDetailFooter.tsx | 5 ++++- .../PaymentReceiveDetailFooter.tsx | 7 +++++-- .../ReceiptDetailFooter.tsx | 7 +++++-- .../VendorCreditDetailFooter.tsx | 6 +++++- .../ExpenseForm/ExpenseFormFooterLeft.tsx | 2 ++ .../Bills/BillForm/BillFormFooterLeft.tsx | 2 ++ .../VendorCreditNoteFormFooterLeft.tsx | 2 ++ .../PaymentForm/PaymentMadeFormFooterLeft.tsx | 3 ++- .../CreditNoteFormFooterLeft.tsx | 4 ++++ .../EstimateForm/EstimateFormFooterLeft.tsx | 8 +++++++- .../InvoiceForm/InvoiceFormFooterLeft.tsx | 4 ++++ .../PaymentReceiveFormFootetLeft.tsx | 3 ++- .../ReceiptForm/ReceiptFormFooterLeft.tsx | 4 ++++ .../WarehouseTransferFormFooterLeft.tsx | 2 ++ .../webapp/src/style/components/Details.scss | 7 +++++++ 22 files changed, 96 insertions(+), 23 deletions(-) diff --git a/packages/webapp/src/components/Details/index.tsx b/packages/webapp/src/components/Details/index.tsx index 9879fc7c0..fe35b9efb 100644 --- a/packages/webapp/src/components/Details/index.tsx +++ b/packages/webapp/src/components/Details/index.tsx @@ -1,6 +1,6 @@ // @ts-nocheck import React from 'react'; -import classNames from 'classnames'; +import clsx from 'classnames'; import '@/style/components/Details.scss'; @@ -24,7 +24,7 @@ export function DetailsMenu({ }) { return (
{label}
-
{children}
+
{children}
); } diff --git a/packages/webapp/src/containers/Accounting/MakeJournal/MakeJournalFormFooterLeft.tsx b/packages/webapp/src/containers/Accounting/MakeJournal/MakeJournalFormFooterLeft.tsx index 8912f1de8..22d4cba38 100644 --- a/packages/webapp/src/containers/Accounting/MakeJournal/MakeJournalFormFooterLeft.tsx +++ b/packages/webapp/src/containers/Accounting/MakeJournal/MakeJournalFormFooterLeft.tsx @@ -15,6 +15,8 @@ export function MakeJournalFormFooterLeft() { diff --git a/packages/webapp/src/containers/Drawers/BillDrawer/BillDetailFooter.tsx b/packages/webapp/src/containers/Drawers/BillDrawer/BillDetailFooter.tsx index 0948821f3..526a4112c 100644 --- a/packages/webapp/src/containers/Drawers/BillDrawer/BillDetailFooter.tsx +++ b/packages/webapp/src/containers/Drawers/BillDrawer/BillDetailFooter.tsx @@ -20,7 +20,9 @@ export default function BillDetailFooter() { - }>{bill.note} + } multiline> + {bill.note} + diff --git a/packages/webapp/src/containers/Drawers/CashflowTransactionDetailDrawer/CashflowTransactionDrawerFooter.tsx b/packages/webapp/src/containers/Drawers/CashflowTransactionDetailDrawer/CashflowTransactionDrawerFooter.tsx index b3a7ea58f..d8584bb4a 100644 --- a/packages/webapp/src/containers/Drawers/CashflowTransactionDetailDrawer/CashflowTransactionDrawerFooter.tsx +++ b/packages/webapp/src/containers/Drawers/CashflowTransactionDetailDrawer/CashflowTransactionDrawerFooter.tsx @@ -9,7 +9,10 @@ export function CashflowTransactionDrawerFooter() { return ( - }> + } + multiline + > {cashflowTransaction.description} diff --git a/packages/webapp/src/containers/Drawers/CreditNoteDetailDrawer/CreditNoteDetailFooter.tsx b/packages/webapp/src/containers/Drawers/CreditNoteDetailDrawer/CreditNoteDetailFooter.tsx index 91b0c7627..ba9e2be92 100644 --- a/packages/webapp/src/containers/Drawers/CreditNoteDetailDrawer/CreditNoteDetailFooter.tsx +++ b/packages/webapp/src/containers/Drawers/CreditNoteDetailDrawer/CreditNoteDetailFooter.tsx @@ -21,11 +21,15 @@ export default function CreditNoteDetailFooter() { - } children={creditNote.note} /> + } + children={creditNote.note} + multiline + /> - }> + } multiline> {creditNote.terms_conditions} diff --git a/packages/webapp/src/containers/Drawers/EstimateDetailDrawer/EstimateDetailFooter.tsx b/packages/webapp/src/containers/Drawers/EstimateDetailDrawer/EstimateDetailFooter.tsx index 50223e70e..bafc4cbcf 100644 --- a/packages/webapp/src/containers/Drawers/EstimateDetailDrawer/EstimateDetailFooter.tsx +++ b/packages/webapp/src/containers/Drawers/EstimateDetailDrawer/EstimateDetailFooter.tsx @@ -16,17 +16,20 @@ import { useEstimateDetailDrawerContext } from './EstimateDetailDrawerProvider'; */ export default function EstimateDetailFooter() { const { estimate } = useEstimateDetailDrawerContext(); - + return ( - }> + } + multiline + > {estimate.terms_conditions} - }> + } multiline> {estimate.note} diff --git a/packages/webapp/src/containers/Drawers/InvoiceDetailDrawer/InvoiceDetailFooter.tsx b/packages/webapp/src/containers/Drawers/InvoiceDetailDrawer/InvoiceDetailFooter.tsx index 237254652..f21170b49 100644 --- a/packages/webapp/src/containers/Drawers/InvoiceDetailDrawer/InvoiceDetailFooter.tsx +++ b/packages/webapp/src/containers/Drawers/InvoiceDetailDrawer/InvoiceDetailFooter.tsx @@ -23,13 +23,16 @@ export function InvoiceDetailFooter() { - }> + } multiline> {invoice.terms_conditions} - }> + } + multiline + > {invoice.invoice_message} diff --git a/packages/webapp/src/containers/Drawers/PaymentMadeDetailDrawer/PaymentMadeDetailFooter.tsx b/packages/webapp/src/containers/Drawers/PaymentMadeDetailDrawer/PaymentMadeDetailFooter.tsx index 110670fed..5dda3235d 100644 --- a/packages/webapp/src/containers/Drawers/PaymentMadeDetailDrawer/PaymentMadeDetailFooter.tsx +++ b/packages/webapp/src/containers/Drawers/PaymentMadeDetailDrawer/PaymentMadeDetailFooter.tsx @@ -20,7 +20,10 @@ export function PaymentMadeDetailFooter() { - }> + } + multiline + > {paymentMade.statement} diff --git a/packages/webapp/src/containers/Drawers/PaymentReceiveDetailDrawer/PaymentReceiveDetailFooter.tsx b/packages/webapp/src/containers/Drawers/PaymentReceiveDetailDrawer/PaymentReceiveDetailFooter.tsx index 019023174..36664acb3 100644 --- a/packages/webapp/src/containers/Drawers/PaymentReceiveDetailDrawer/PaymentReceiveDetailFooter.tsx +++ b/packages/webapp/src/containers/Drawers/PaymentReceiveDetailDrawer/PaymentReceiveDetailFooter.tsx @@ -16,12 +16,15 @@ import { usePaymentReceiveDetailContext } from './PaymentReceiveDetailProvider'; */ export default function PaymentReceiveDetailFooter() { const { paymentReceive } = usePaymentReceiveDetailContext(); - + return ( - }> + } + multiline + > {paymentReceive.statement} diff --git a/packages/webapp/src/containers/Drawers/ReceiptDetailDrawer/ReceiptDetailFooter.tsx b/packages/webapp/src/containers/Drawers/ReceiptDetailDrawer/ReceiptDetailFooter.tsx index 8b7b1d859..fd47113c6 100644 --- a/packages/webapp/src/containers/Drawers/ReceiptDetailDrawer/ReceiptDetailFooter.tsx +++ b/packages/webapp/src/containers/Drawers/ReceiptDetailDrawer/ReceiptDetailFooter.tsx @@ -21,12 +21,15 @@ export default function ReceiptDetailFooter() { - }> + } multiline> {receipt.statement} - }> + } + multiline + > {receipt.receipt_message} diff --git a/packages/webapp/src/containers/Drawers/VendorCreditDetailDrawer/VendorCreditDetailFooter.tsx b/packages/webapp/src/containers/Drawers/VendorCreditDetailDrawer/VendorCreditDetailFooter.tsx index c698b04a6..055f9ae73 100644 --- a/packages/webapp/src/containers/Drawers/VendorCreditDetailDrawer/VendorCreditDetailFooter.tsx +++ b/packages/webapp/src/containers/Drawers/VendorCreditDetailDrawer/VendorCreditDetailFooter.tsx @@ -16,7 +16,11 @@ export function VendorCreditDetailFooter() { - } children={vendorCredit.note} /> + } + children={vendorCredit.note} + multiline + /> diff --git a/packages/webapp/src/containers/Expenses/ExpenseForm/ExpenseFormFooterLeft.tsx b/packages/webapp/src/containers/Expenses/ExpenseForm/ExpenseFormFooterLeft.tsx index e6dc5443d..54bd8939f 100644 --- a/packages/webapp/src/containers/Expenses/ExpenseForm/ExpenseFormFooterLeft.tsx +++ b/packages/webapp/src/containers/Expenses/ExpenseForm/ExpenseFormFooterLeft.tsx @@ -14,6 +14,8 @@ export function ExpenseFormFooterLeft() { } + multiline + fastField /> diff --git a/packages/webapp/src/containers/Purchases/Bills/BillForm/BillFormFooterLeft.tsx b/packages/webapp/src/containers/Purchases/Bills/BillForm/BillFormFooterLeft.tsx index 77c529b87..43bb005e2 100644 --- a/packages/webapp/src/containers/Purchases/Bills/BillForm/BillFormFooterLeft.tsx +++ b/packages/webapp/src/containers/Purchases/Bills/BillForm/BillFormFooterLeft.tsx @@ -15,6 +15,8 @@ export function BillFormFooterLeft() { diff --git a/packages/webapp/src/containers/Purchases/CreditNotes/CreditNoteForm/VendorCreditNoteFormFooterLeft.tsx b/packages/webapp/src/containers/Purchases/CreditNotes/CreditNoteForm/VendorCreditNoteFormFooterLeft.tsx index beb3f4966..dfe3938f1 100644 --- a/packages/webapp/src/containers/Purchases/CreditNotes/CreditNoteForm/VendorCreditNoteFormFooterLeft.tsx +++ b/packages/webapp/src/containers/Purchases/CreditNotes/CreditNoteForm/VendorCreditNoteFormFooterLeft.tsx @@ -15,6 +15,8 @@ export function VendorCreditNoteFormFooterLeft() { diff --git a/packages/webapp/src/containers/Purchases/PaymentMades/PaymentForm/PaymentMadeFormFooterLeft.tsx b/packages/webapp/src/containers/Purchases/PaymentMades/PaymentForm/PaymentMadeFormFooterLeft.tsx index 699859923..4944b159f 100644 --- a/packages/webapp/src/containers/Purchases/PaymentMades/PaymentForm/PaymentMadeFormFooterLeft.tsx +++ b/packages/webapp/src/containers/Purchases/PaymentMades/PaymentForm/PaymentMadeFormFooterLeft.tsx @@ -20,7 +20,8 @@ export function PaymentMadeFormFooterLeft() { diff --git a/packages/webapp/src/containers/Sales/CreditNotes/CreditNoteForm/CreditNoteFormFooterLeft.tsx b/packages/webapp/src/containers/Sales/CreditNotes/CreditNoteForm/CreditNoteFormFooterLeft.tsx index 2b86b1319..3b62a70ab 100644 --- a/packages/webapp/src/containers/Sales/CreditNotes/CreditNoteForm/CreditNoteFormFooterLeft.tsx +++ b/packages/webapp/src/containers/Sales/CreditNotes/CreditNoteForm/CreditNoteFormFooterLeft.tsx @@ -15,6 +15,8 @@ export function CreditNoteFormFooterLeft() { {/* --------- Terms and conditions --------- */} @@ -27,6 +29,8 @@ export function CreditNoteFormFooterLeft() { placeholder={intl.get( 'credit_note.label_terms_and_conditions.placeholder', )} + multiline + fastField /> diff --git a/packages/webapp/src/containers/Sales/Estimates/EstimateForm/EstimateFormFooterLeft.tsx b/packages/webapp/src/containers/Sales/Estimates/EstimateForm/EstimateFormFooterLeft.tsx index 20968e4b1..7e84bb9d4 100644 --- a/packages/webapp/src/containers/Sales/Estimates/EstimateForm/EstimateFormFooterLeft.tsx +++ b/packages/webapp/src/containers/Sales/Estimates/EstimateForm/EstimateFormFooterLeft.tsx @@ -16,6 +16,8 @@ export function EstimateFormFooterLeft() { @@ -26,7 +28,11 @@ export function EstimateFormFooterLeft() { > diff --git a/packages/webapp/src/containers/Sales/Invoices/InvoiceForm/InvoiceFormFooterLeft.tsx b/packages/webapp/src/containers/Sales/Invoices/InvoiceForm/InvoiceFormFooterLeft.tsx index 14ff7d721..df6ec6236 100644 --- a/packages/webapp/src/containers/Sales/Invoices/InvoiceForm/InvoiceFormFooterLeft.tsx +++ b/packages/webapp/src/containers/Sales/Invoices/InvoiceForm/InvoiceFormFooterLeft.tsx @@ -15,6 +15,8 @@ export function InvoiceFormFooterLeft() { @@ -28,6 +30,8 @@ export function InvoiceFormFooterLeft() { placeholder={intl.get( 'invoice_form.terms_and_conditions.placeholder', )} + multiline + fastField /> diff --git a/packages/webapp/src/containers/Sales/PaymentReceives/PaymentReceiveForm/PaymentReceiveFormFootetLeft.tsx b/packages/webapp/src/containers/Sales/PaymentReceives/PaymentReceiveForm/PaymentReceiveFormFootetLeft.tsx index 2010cdb96..cc3cd371a 100644 --- a/packages/webapp/src/containers/Sales/PaymentReceives/PaymentReceiveForm/PaymentReceiveFormFootetLeft.tsx +++ b/packages/webapp/src/containers/Sales/PaymentReceives/PaymentReceiveForm/PaymentReceiveFormFootetLeft.tsx @@ -18,7 +18,8 @@ export function PaymentReceiveFormFootetLeft() { placeholder={intl.get( 'payment_receive_form.internal_note.placeholder', )} - fastField={true} + fastField + multiline /> diff --git a/packages/webapp/src/containers/Sales/Receipts/ReceiptForm/ReceiptFormFooterLeft.tsx b/packages/webapp/src/containers/Sales/Receipts/ReceiptForm/ReceiptFormFooterLeft.tsx index 04f797b52..590d2d371 100644 --- a/packages/webapp/src/containers/Sales/Receipts/ReceiptForm/ReceiptFormFooterLeft.tsx +++ b/packages/webapp/src/containers/Sales/Receipts/ReceiptForm/ReceiptFormFooterLeft.tsx @@ -16,6 +16,8 @@ export function ReceiptFormFooterLeft() { @@ -29,6 +31,8 @@ export function ReceiptFormFooterLeft() { placeholder={intl.get( 'receipt_form.terms_and_conditions.placeholder', )} + multiline + fastField /> diff --git a/packages/webapp/src/containers/WarehouseTransfers/WarehouseTransferForm/WarehouseTransferFormFooterLeft.tsx b/packages/webapp/src/containers/WarehouseTransfers/WarehouseTransferForm/WarehouseTransferFormFooterLeft.tsx index d42b1be93..018b0c06a 100644 --- a/packages/webapp/src/containers/WarehouseTransfers/WarehouseTransferForm/WarehouseTransferFormFooterLeft.tsx +++ b/packages/webapp/src/containers/WarehouseTransfers/WarehouseTransferForm/WarehouseTransferFormFooterLeft.tsx @@ -15,6 +15,8 @@ export function WarehouseTransferFormFooterLeft() { diff --git a/packages/webapp/src/style/components/Details.scss b/packages/webapp/src/style/components/Details.scss index fd28128cb..16495a04d 100644 --- a/packages/webapp/src/style/components/Details.scss +++ b/packages/webapp/src/style/components/Details.scss @@ -48,6 +48,13 @@ &__content { text-transform: capitalize; } + + &.detail-item--multilines{ + + .detail-item__content{ + white-space: pre-line; + } + } } + .details-menu{