From 80d86b01decdc7f83bde311e046e0d9d08b08209 Mon Sep 17 00:00:00 2001 From: elforjani13 <39470382+elforjani13@users.noreply.github.com> Date: Sun, 26 Dec 2021 13:28:25 +0200 Subject: [PATCH] feat: add payment receive & bill detail footer. --- .../Drawers/BillDrawer/BillDetailFooter.js | 56 ++++++------------- .../Drawers/BillDrawer/BillDetailTab.js | 5 +- .../BillDrawer/BillDetailTableFooter.js | 51 +++++++++++++++++ .../PaymentReceiveDetailFooter.js | 44 +++++---------- .../PaymentReceiveDetailTab.js | 2 + .../PaymentReceiveDetailTableFooter.js | 46 +++++++++++++++ src/lang/ar/index.json | 3 +- src/lang/en/index.json | 10 +++- 8 files changed, 143 insertions(+), 74 deletions(-) create mode 100644 src/containers/Drawers/BillDrawer/BillDetailTableFooter.js create mode 100644 src/containers/Drawers/PaymentReceiveDetailDrawer/PaymentReceiveDetailTableFooter.js diff --git a/src/containers/Drawers/BillDrawer/BillDetailFooter.js b/src/containers/Drawers/BillDrawer/BillDetailFooter.js index 43b7bebde..c5d411cb1 100644 --- a/src/containers/Drawers/BillDrawer/BillDetailFooter.js +++ b/src/containers/Drawers/BillDrawer/BillDetailFooter.js @@ -1,51 +1,27 @@ import React from 'react'; -import styled from 'styled-components'; - import { - TotalLineBorderStyle, - TotalLineTextStyle, - FormatNumber, + CommercialDocFooter, T, - TotalLines, - TotalLine, -} from '../../../components'; + If, + DetailsMenu, + DetailItem, +} from 'components'; + import { useBillDrawerContext } from './BillDrawerProvider'; /** - * Bill read-only details footer. + * Bill detail footer. + * @returns {React.JSX} */ -export function BillDetailFooter() { +export default function BillDetailFooter() { const { bill } = useBillDrawerContext(); - return ( - - - } - value={} - borderStyle={TotalLineBorderStyle.SingleDark} - /> - } - value={bill.formatted_amount} - borderStyle={TotalLineBorderStyle.DoubleDark} - textStyle={TotalLineTextStyle.Bold} - /> - } - value={bill.formatted_payment_amount} - /> - } - value={bill.formatted_due_amount} - /> - - + + + + }>{bill.note} + + + ); } - -export const BillDetailsFooterRoot = styled.div``; - -export const BillTotalLines = styled(TotalLines)` - margin-left: auto; -`; diff --git a/src/containers/Drawers/BillDrawer/BillDetailTab.js b/src/containers/Drawers/BillDrawer/BillDetailTab.js index 86fcd6571..fd238d216 100644 --- a/src/containers/Drawers/BillDrawer/BillDetailTab.js +++ b/src/containers/Drawers/BillDrawer/BillDetailTab.js @@ -4,8 +4,8 @@ import { CommercialDocBox } from 'components'; import BillDetailHeader from './BillDetailHeader'; import BillDetailTable from './BillDetailTable'; -import { BillDetailFooter } from './BillDetailFooter'; - +import { BillDetailTableFooter } from './BillDetailTableFooter'; +import BillDetailFooter from './BillDetailFooter'; /** * Bill detail panel tab. @@ -15,6 +15,7 @@ export default function BillDetailTab() { + ); diff --git a/src/containers/Drawers/BillDrawer/BillDetailTableFooter.js b/src/containers/Drawers/BillDrawer/BillDetailTableFooter.js new file mode 100644 index 000000000..d55edc514 --- /dev/null +++ b/src/containers/Drawers/BillDrawer/BillDetailTableFooter.js @@ -0,0 +1,51 @@ +import React from 'react'; +import styled from 'styled-components'; + +import { + TotalLineBorderStyle, + TotalLineTextStyle, + FormatNumber, + T, + TotalLines, + TotalLine, +} from '../../../components'; +import { useBillDrawerContext } from './BillDrawerProvider'; + +/** + * Bill read-only details table footer. + */ +export function BillDetailTableFooter() { + const { bill } = useBillDrawerContext(); + + return ( + + + } + value={} + borderStyle={TotalLineBorderStyle.SingleDark} + /> + } + value={bill.formatted_amount} + borderStyle={TotalLineBorderStyle.DoubleDark} + textStyle={TotalLineTextStyle.Bold} + /> + } + value={bill.formatted_payment_amount} + /> + } + value={bill.formatted_due_amount} + /> + + + ); +} + +export const BillDetailsFooterRoot = styled.div``; + +export const BillTotalLines = styled(TotalLines)` + margin-left: auto; +`; diff --git a/src/containers/Drawers/PaymentReceiveDetailDrawer/PaymentReceiveDetailFooter.js b/src/containers/Drawers/PaymentReceiveDetailDrawer/PaymentReceiveDetailFooter.js index 45876042b..6f4f37199 100644 --- a/src/containers/Drawers/PaymentReceiveDetailDrawer/PaymentReceiveDetailFooter.js +++ b/src/containers/Drawers/PaymentReceiveDetailDrawer/PaymentReceiveDetailFooter.js @@ -1,13 +1,11 @@ import React from 'react'; -import styled from 'styled-components'; import { - FormatNumber, - TotalLineTextStyle, - TotalLineBorderStyle, + CommercialDocFooter, T, - TotalLine, - TotalLines, + If, + DetailsMenu, + DetailItem, } from 'components'; import { usePaymentReceiveDetailContext } from './PaymentReceiveDetailProvider'; @@ -17,30 +15,16 @@ import { usePaymentReceiveDetailContext } from './PaymentReceiveDetailProvider'; */ export default function PaymentReceiveDetailFooter() { const { paymentReceive } = usePaymentReceiveDetailContext(); - + return ( - - - } - value={} - /> - } - value={paymentReceive.formatted_amount} - borderStyle={TotalLineBorderStyle.DoubleDark} - textStyle={TotalLineTextStyle.Bold} - /> - - + + + + }> + {paymentReceive.statement} + + + + ); } - -export const PaymentReceiveDetailsFooterRoot = styled.div``; - -export const PaymentReceiveTotalLines = styled(TotalLines)` - margin-left: auto; -`; diff --git a/src/containers/Drawers/PaymentReceiveDetailDrawer/PaymentReceiveDetailTab.js b/src/containers/Drawers/PaymentReceiveDetailDrawer/PaymentReceiveDetailTab.js index edf48e1c7..f84f2c633 100644 --- a/src/containers/Drawers/PaymentReceiveDetailDrawer/PaymentReceiveDetailTab.js +++ b/src/containers/Drawers/PaymentReceiveDetailDrawer/PaymentReceiveDetailTab.js @@ -5,6 +5,7 @@ import { CommercialDocBox } from 'components'; import PaymentReceiveDetailHeader from './PaymentReceiveDetailHeader'; import PaymentReceiveDetailTable from './PaymentReceiveDetailTable'; +import PaymentReceiveDetailTableFooter from './PaymentReceiveDetailTableFooter'; import PaymentReceiveDetailFooter from './PaymentReceiveDetailFooter'; /** @@ -17,6 +18,7 @@ export default function PaymentReceiveDetailTab() { + diff --git a/src/containers/Drawers/PaymentReceiveDetailDrawer/PaymentReceiveDetailTableFooter.js b/src/containers/Drawers/PaymentReceiveDetailDrawer/PaymentReceiveDetailTableFooter.js new file mode 100644 index 000000000..5b677ae4a --- /dev/null +++ b/src/containers/Drawers/PaymentReceiveDetailDrawer/PaymentReceiveDetailTableFooter.js @@ -0,0 +1,46 @@ +import React from 'react'; +import styled from 'styled-components'; + +import { + FormatNumber, + TotalLineTextStyle, + TotalLineBorderStyle, + T, + TotalLine, + TotalLines, +} from 'components'; +import { usePaymentReceiveDetailContext } from './PaymentReceiveDetailProvider'; + +/** + * Payment receive detail table footer. + * @returns {React.JSX} + */ +export default function PaymentReceiveDetailTableFooter() { + const { paymentReceive } = usePaymentReceiveDetailContext(); + + return ( + + + } + value={} + /> + } + value={paymentReceive.formatted_amount} + borderStyle={TotalLineBorderStyle.DoubleDark} + textStyle={TotalLineTextStyle.Bold} + /> + + + ); +} + +export const PaymentReceiveDetailsFooterRoot = styled.div``; + +export const PaymentReceiveTotalLines = styled(TotalLines)` + margin-left: auto; +`; diff --git a/src/lang/ar/index.json b/src/lang/ar/index.json index 6f924d22b..d1747625b 100644 --- a/src/lang/ar/index.json +++ b/src/lang/ar/index.json @@ -1659,7 +1659,8 @@ "transactions": "معاملات ", "item.drawer_transactions_by": "معاملات حسب :", "item.drawer_quantity_sold": "الكمية المباعة", - "journal_entries.amount_displayed_base_currency":"يتم عرض المبلغ بالعملة الأساسية الخاصة بك " + "journal_entries.amount_displayed_base_currency":"يتم عرض المبلغ بالعملة الأساسية الخاصة بك ", + "inventory_adjustment.column.product":"المنتج" } diff --git a/src/lang/en/index.json b/src/lang/en/index.json index bb10562dc..224164922 100644 --- a/src/lang/en/index.json +++ b/src/lang/en/index.json @@ -1195,6 +1195,7 @@ "payment_receive.details.payment_number": "Payment #", "payment_receive.details.total": "TOTAL", "payment_receive.details.subtotal": "Subtotal", + "payment_receive.details.statement": "Statement", "estimate.details.estimate_number": "Estimate #", "estimate.details.subtotal": "Subtotal", "estimate.details.total": "TOTAL", @@ -1202,12 +1203,15 @@ "estimate.details.due_amount": "Due amount", "estimate.details.note": "Note", "estimate.details.created_at": "Created at", + "estimate.details.terms_conditions": "Terms & Conditions", "receipt.details.receipt_number": "Receipt #", "receipt.details.subtotal": "Subtotal", "receipt.details.total": "TOTAL", "receipt.details.payment_amount": "Payment amount", "receipt.details.due_amount": "Due amount", "receipt.details.created_at": "Created at", + "receipt.details.receipt_message": "Receipt Message", + "receipt.details.statement": "Statement", "invoice.details.created_at": "Created at", "invoice.details.total": "TOTAL", "invoice.details.subtotal": "Subtotal", @@ -1523,6 +1527,7 @@ "credit_note.drawer.label_subtotal": "Subtotal", "credit_note.drawer.label_refund_transactions": "Refund Transactions", "credit_note.drawer.label_invoices_reconciled": "Invoices Reconciled", + "credit_note.drawer.terms_conditions": "Terms Conditions", "sidebar_vendor_credits": "Vendor Credits", "vendor_credits.lable_vendor_credit_list": "Vendor Credits List", @@ -1655,5 +1660,8 @@ "item.drawer_transactions_by": "Transactions by:", "item.drawer_quantity_sold": "Quantity Sold", "role_name": "Role name", - "journal_entries.amount_displayed_base_currency":"Amount is displayed in your base currency" + "journal_entries.amount_displayed_base_currency":"Amount is displayed in your base currency", + "inventory_adjustment.column.product":"Product", + "convert_to_credit_note":"Convert to Credit Note", + "convert_to_vendor_credit":"Convert to Vendor Credit" } \ No newline at end of file