From d47ed3754f3c424a3a874ff0bbd3d3523e104c65 Mon Sep 17 00:00:00 2001 From: "a.bouhuolia" Date: Sun, 12 Sep 2021 14:58:22 +0200 Subject: [PATCH] BIG-40: fix localize invoice, bill, estimate, expense receipt details drawer. --- .../Drawers/BillDrawer/BillDetailFooter.js | 10 ++--- .../Drawers/BillDrawer/BillDetailHeader.js | 5 ++- .../EstimateDetailFooter.js | 12 ++--- .../EstimateDetailHeader.js | 7 ++- .../ExpenseDrawer/ExpenseDrawerFooter.js | 5 ++- .../InvoiceDetailFooter.js | 10 ++--- .../InvoiceDetailHeader.js | 5 ++- .../PaymentMadeDetailFooter.js | 10 ++--- .../PaymentReceiveDetailFooter.js | 6 +-- .../ReceiptDetailFooter.js | 10 ++--- .../ReceiptDetailHeader.js | 7 ++- client/src/lang/ar/index.json | 45 +++++++++++++++---- client/src/lang/en/index.json | 27 +++++++++++ 13 files changed, 111 insertions(+), 48 deletions(-) diff --git a/client/src/containers/Drawers/BillDrawer/BillDetailFooter.js b/client/src/containers/Drawers/BillDrawer/BillDetailFooter.js index b4e761e2d..adcbff422 100644 --- a/client/src/containers/Drawers/BillDrawer/BillDetailFooter.js +++ b/client/src/containers/Drawers/BillDrawer/BillDetailFooter.js @@ -1,7 +1,7 @@ import React from 'react'; import clsx from 'classnames'; -import { TotalLines, TotalLine } from 'components'; +import { T, TotalLines, TotalLine } from 'components'; import BillDrawerCls from 'style/components/Drawers/BillDrawer.module.scss'; import { useBillDrawerContext } from './BillDrawerProvider'; @@ -12,22 +12,22 @@ export function BillDetailFooter() {
} value={bill.amount} className={BillDrawerCls.total_line_subtotal} /> } value={bill.amount} className={BillDrawerCls.total_line_total} /> } value={bill.payment_amount} className={BillDrawerCls.total_line_payment} /> } value={bill.formatted_due_amount} className={BillDrawerCls.total_line_dueAmount} /> diff --git a/client/src/containers/Drawers/BillDrawer/BillDetailHeader.js b/client/src/containers/Drawers/BillDrawer/BillDetailHeader.js index 57a488087..cd07bfeb8 100644 --- a/client/src/containers/Drawers/BillDrawer/BillDetailHeader.js +++ b/client/src/containers/Drawers/BillDrawer/BillDetailHeader.js @@ -48,7 +48,10 @@ export default function BillDetailHeader() { label={intl.get('reference')} children={defaultTo(bill.reference_no, '--')} /> - +
); diff --git a/client/src/containers/Drawers/EstimateDetailDrawer/EstimateDetailFooter.js b/client/src/containers/Drawers/EstimateDetailDrawer/EstimateDetailFooter.js index fae47b75e..4c50ecb40 100644 --- a/client/src/containers/Drawers/EstimateDetailDrawer/EstimateDetailFooter.js +++ b/client/src/containers/Drawers/EstimateDetailDrawer/EstimateDetailFooter.js @@ -1,7 +1,7 @@ import React from 'react'; import clsx from 'classnames'; -import { TotalLines, TotalLine, If } from 'components'; +import { T, TotalLines, TotalLine, If } from 'components'; import EstimateDetailsCls from 'style/components/Drawers/EstimateDetails.module.scss'; @@ -13,22 +13,22 @@ export default function EstimateDetailFooter() {
} value={'1000'} className={EstimateDetailsCls.total_line_subtotal} /> } value={'1000'} className={EstimateDetailsCls.total_line_total} /> } value={'1000'} className={EstimateDetailsCls.total_line_payment} /> } value={'1000'} className={EstimateDetailsCls.total_line_dueAmount} /> @@ -37,7 +37,7 @@ export default function EstimateDetailFooter() {

- Note: -- + : --

diff --git a/client/src/containers/Drawers/EstimateDetailDrawer/EstimateDetailHeader.js b/client/src/containers/Drawers/EstimateDetailDrawer/EstimateDetailHeader.js index 9a8f9d806..a92823f4f 100644 --- a/client/src/containers/Drawers/EstimateDetailDrawer/EstimateDetailHeader.js +++ b/client/src/containers/Drawers/EstimateDetailDrawer/EstimateDetailHeader.js @@ -3,7 +3,7 @@ import intl from 'react-intl-universal'; import { defaultTo } from 'lodash'; import clsx from 'classnames'; -import { DetailsMenu, DetailItem } from 'components'; +import { T, DetailsMenu, DetailItem } from 'components'; import { useEstimateDetailDrawerContext } from './EstimateDetailDrawerProvider'; import EstimateDetailsCls from 'style/components/Drawers/EstimateDetails.module.scss'; @@ -43,7 +43,10 @@ export default function EstimateDetailHeader() { label={intl.get('reference')} children={defaultTo(estimate.reference, '-')} /> - + } + children={'2020 Ang 21'} + />
); diff --git a/client/src/containers/Drawers/ExpenseDrawer/ExpenseDrawerFooter.js b/client/src/containers/Drawers/ExpenseDrawer/ExpenseDrawerFooter.js index c1641512b..3747386a3 100644 --- a/client/src/containers/Drawers/ExpenseDrawer/ExpenseDrawerFooter.js +++ b/client/src/containers/Drawers/ExpenseDrawer/ExpenseDrawerFooter.js @@ -1,4 +1,5 @@ import React from 'react'; +import { T } from 'components'; import { useExpenseDrawerContext } from './ExpenseDrawerProvider'; export default function ExpenseDrawerFooter() { @@ -8,11 +9,11 @@ export default function ExpenseDrawerFooter() {
-
Subtotal
+
{total_amount}
-
TOTAL
+
{total_amount}
diff --git a/client/src/containers/Drawers/InvoiceDetailDrawer/InvoiceDetailFooter.js b/client/src/containers/Drawers/InvoiceDetailDrawer/InvoiceDetailFooter.js index 7ef13ec14..e0855177c 100644 --- a/client/src/containers/Drawers/InvoiceDetailDrawer/InvoiceDetailFooter.js +++ b/client/src/containers/Drawers/InvoiceDetailDrawer/InvoiceDetailFooter.js @@ -1,7 +1,7 @@ import React from 'react'; import clsx from 'classnames'; -import { TotalLines, TotalLine } from 'components'; +import { T, TotalLines, TotalLine } from 'components'; import InvoiceDrawerCls from 'style/components/Drawers/InvoiceDrawer.module.scss'; import { useInvoiceDetailDrawerContext } from './InvoiceDetailDrawerProvider'; @@ -15,22 +15,22 @@ export function InvoiceDetailFooter() {
} value={invoice.balance} className={InvoiceDrawerCls.total_line_subtotal} /> } value={invoice.balance} className={InvoiceDrawerCls.total_line_total} /> } value={invoice.payment_amount} className={InvoiceDrawerCls.total_line_payment} /> } value={'1000'} className={InvoiceDrawerCls.total_line_dueAmount} /> diff --git a/client/src/containers/Drawers/InvoiceDetailDrawer/InvoiceDetailHeader.js b/client/src/containers/Drawers/InvoiceDetailDrawer/InvoiceDetailHeader.js index 2d2a75fe4..3fd60dd58 100644 --- a/client/src/containers/Drawers/InvoiceDetailDrawer/InvoiceDetailHeader.js +++ b/client/src/containers/Drawers/InvoiceDetailDrawer/InvoiceDetailHeader.js @@ -47,7 +47,10 @@ export default function InvoiceDetailHeader() { label={intl.get('reference')} children={defaultTo(invoice.reference_no, '--')} /> - +
); diff --git a/client/src/containers/Drawers/PaymentMadeDetailDrawer/PaymentMadeDetailFooter.js b/client/src/containers/Drawers/PaymentMadeDetailDrawer/PaymentMadeDetailFooter.js index 7b97e1539..6786d4ad0 100644 --- a/client/src/containers/Drawers/PaymentMadeDetailDrawer/PaymentMadeDetailFooter.js +++ b/client/src/containers/Drawers/PaymentMadeDetailDrawer/PaymentMadeDetailFooter.js @@ -1,28 +1,24 @@ import React from 'react'; import clsx from 'classnames'; -import { TotalLines, TotalLine } from 'components'; - -import { usePaymentMadeDetailContext } from './PaymentMadeDetailProvider'; - +import { T, TotalLines, TotalLine } from 'components'; import PaymentDrawerCls from './PaymentMadeDrawer.module.scss'; /** * Payment made - Details panel - Footer. */ export default function PaymentMadeDetailFooter() { - const { } = usePaymentMadeDetailContext(); return (
} value={1000} className={clsx(PaymentDrawerCls.total_line_subtotal)} /> } value={1000} className={clsx(PaymentDrawerCls.total_line_total)} /> diff --git a/client/src/containers/Drawers/PaymentReceiveDetailDrawer/PaymentReceiveDetailFooter.js b/client/src/containers/Drawers/PaymentReceiveDetailDrawer/PaymentReceiveDetailFooter.js index 67a83d44b..fa5febb58 100644 --- a/client/src/containers/Drawers/PaymentReceiveDetailDrawer/PaymentReceiveDetailFooter.js +++ b/client/src/containers/Drawers/PaymentReceiveDetailDrawer/PaymentReceiveDetailFooter.js @@ -1,7 +1,7 @@ import React from 'react'; import clsx from 'classnames'; -import { TotalLine, TotalLines } from 'components'; +import { T, TotalLine, TotalLines } from 'components'; import { usePaymentReceiveDetailContext } from './PaymentReceiveDetailProvider'; import PaymentDrawerCls from './PaymentReceiveDrawer.module.scss'; @@ -16,12 +16,12 @@ export default function PaymentReceiveDetailFooter() {
} value={paymentReceive.amount} className={PaymentDrawerCls.total_line_subtotal} /> } value={paymentReceive.amount} className={PaymentDrawerCls.total_line_total} /> diff --git a/client/src/containers/Drawers/ReceiptDetailDrawer/ReceiptDetailFooter.js b/client/src/containers/Drawers/ReceiptDetailDrawer/ReceiptDetailFooter.js index 35258deb7..522b94000 100644 --- a/client/src/containers/Drawers/ReceiptDetailDrawer/ReceiptDetailFooter.js +++ b/client/src/containers/Drawers/ReceiptDetailDrawer/ReceiptDetailFooter.js @@ -1,7 +1,7 @@ import React from 'react'; import clsx from 'classnames'; -import { TotalLines, TotalLine } from 'components'; +import { T, TotalLines, TotalLine } from 'components'; import ReceiptDrawerCls from 'style/components/Drawers/ReceiptDrawer.module.scss'; import { useReceiptDetailDrawerContext } from './ReceiptDetailDrawerProvider'; @@ -13,22 +13,22 @@ export function ReceiptDetailFooter() {
} value={receipt.amount} className={ReceiptDrawerCls.total_line_subtotal} /> } value={receipt.amount} className={ReceiptDrawerCls.total_line_total} /> } value={receipt.amount} className={ReceiptDrawerCls.total_line_payment} /> } value={'0'} className={ReceiptDrawerCls.total_line_dueAmount} /> diff --git a/client/src/containers/Drawers/ReceiptDetailDrawer/ReceiptDetailHeader.js b/client/src/containers/Drawers/ReceiptDetailDrawer/ReceiptDetailHeader.js index 6d2ca5c73..87d1b9722 100644 --- a/client/src/containers/Drawers/ReceiptDetailDrawer/ReceiptDetailHeader.js +++ b/client/src/containers/Drawers/ReceiptDetailDrawer/ReceiptDetailHeader.js @@ -40,7 +40,7 @@ export default function ReceiptDetailHeader() { - @@ -48,7 +48,10 @@ export default function ReceiptDetailHeader() { label={intl.get('reference')} children={defaultTo(receipt.reference_no, '--')} /> - +
); diff --git a/client/src/lang/ar/index.json b/client/src/lang/ar/index.json index f1127ec28..d35a60153 100644 --- a/client/src/lang/ar/index.json +++ b/client/src/lang/ar/index.json @@ -1155,7 +1155,7 @@ "valuation": "القيمة", "select_transaction": "حدد حساب المعاملة", "details": "التفاصيل", - "located_landed_cost": "Located Landed Cost", + "located_landed_cost": "تكاليف اضافية المحملة", "delete_transaction": "مسح العملية", "all_items": "كل الاصناف", "Specific items": "اصناف محددة", @@ -1215,14 +1215,41 @@ "estimate_preview.dialog.title": "معاينة عرض PDF", "receipt_preview.dialog.title":"معاينة إيصال PDF", "edit_contact": "Edit {name}", - "item.sell_description": "Sell description", - "item.purchase_description": "Purchase description", - "closed_date": "Closed date", - "payment_made.details.payment_number": "Payment #", - "payment_receive.details.payment_number": "Payment #", - "estimate.details.estimate_number": "Estimate #", - "receipt.details.receipt_number": "Receipt #", - "bill.details.bill_number": "Bill #", + "item.sell_description": "وصف البيع", + "item.purchase_description": "وصف الشراء", + "closed_date": "تاريخ الاغلاق", + "payment_made.details.payment_number": "رقم العملية", + "payment_made.details.subtotal": "المجموع", + "payment_made.details.total": "إجمالي", + "payment_receive.details.payment_number": "رقم العملية", + "payment_receive.details.total": "إجمالي", + "payment_receive.details.subtotal": "المجموع", + "estimate.details.estimate_number": "رقم العرض", + "estimate.details.subtotal": "المجموع", + "estimate.details.total": "إجمالي", + "estimate.details.payment_made": "مبلغ المدفوع", + "estimate.details.due_amount": "مبلغ المستحق", + "estimate.details.note": "ملاحظة", + "estimate.details.created_at": "أنشئت في", + "receipt.details.receipt_number": "رقم إيصال", + "receipt.details.subtotal": "المجموع", + "receipt.details.total": "إجمالي", + "receipt.details.payment_amount": "مبلغ المدفوع", + "receipt.details.due_amount": "مبلغ المستحق", + "receipt.details.created_at": "أنشئت في", + "bill.details.bill_number": "رقم الفاتورة", + "bill.details.created_at": "أنشئت في", + "bill.details.total": "إجمالي", + "bill.details.subtotal": "المجموع", + "bill.details.payment_amount": "مبلغ المدفوع", + "bill.details.due_amount": "مبلغ المستحق", + "invoice.details.created_at": "أنشئت في", + "invoice.details.total": "إجمالي", + "invoice.details.subtotal": "المجموع", + "invoice.details.due_amount": "مبلغ المستحق", + "invoice.details.payment_amount": "مبلغ المدفوع", + "expense.details.subtotal": "المجموع", + "expense.details.total": "إجمالي", "setup.left_side.title": "سجل منشأة جديدة الأن.", "setup.left_side.description": "حسابك علي Bigcapital", "setup.left_side.footer_help": "نحن هنا للمساعدة!", diff --git a/client/src/lang/en/index.json b/client/src/lang/en/index.json index a751f6032..9a0e005b2 100644 --- a/client/src/lang/en/index.json +++ b/client/src/lang/en/index.json @@ -1190,10 +1190,37 @@ "item.purchase_description": "Purchase description", "closed_date": "Closed date", "payment_made.details.payment_number": "Payment #", + "payment_made.details.subtotal": "Subtotal", + "payment_made.details.total": "TOTAL", "payment_receive.details.payment_number": "Payment #", + "payment_receive.details.total": "TOTAL", + "payment_receive.details.subtotal": "Subtotal", "estimate.details.estimate_number": "Estimate #", + "estimate.details.subtotal": "Subtotal", + "estimate.details.total": "TOTAL", + "estimate.details.payment_made": "Payment made", + "estimate.details.due_amount": "Due amount", + "estimate.details.note": "Note", + "estimate.details.created_at": "Created at", "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", + "invoice.details.created_at": "Created at", + "invoice.details.total": "TOTAL", + "invoice.details.subtotal": "Subtotal", + "invoice.details.due_amount": "Due amount", + "invoice.details.payment_amount": "Payment amount", "bill.details.bill_number": "Bill #", + "bill.details.created_at": "Created at", + "bill.details.total": "TOTAL", + "bill.details.subtotal": "Subtotal", + "bill.details.payment_amount": "Payment amount", + "bill.details.due_amount": "Due amount", + "expense.details.subtotal": "Subtotal", + "expense.details.total": "Total", "setup.left_side.title": "Register a New Organization now!.", "setup.left_side.description": "You have a Bigcapital account", "setup.left_side.footer_help": "We’re Here to Help!",