From d8efb17651be4717302aeea2940f2fbd7b2cf62f Mon Sep 17 00:00:00 2001 From: elforjani13 <39470382+elforjani13@users.noreply.github.com> Date: Tue, 28 Dec 2021 12:21:56 +0200 Subject: [PATCH] feat: add notes. --- .../CreditNoteDetailDrawer/CreditNoteDetailFooter.js | 2 +- .../InvoiceDetailDrawer/InvoiceDetailFooter.js | 12 +++++++++--- .../TransactionsLocking/TransactionsLockingHeader.js | 11 ++++++++--- src/lang/ar/index.json | 9 ++++++++- src/lang/en/index.json | 5 +++-- 5 files changed, 29 insertions(+), 10 deletions(-) diff --git a/src/containers/Drawers/CreditNoteDetailDrawer/CreditNoteDetailFooter.js b/src/containers/Drawers/CreditNoteDetailDrawer/CreditNoteDetailFooter.js index 1bcea07e5..24a1cc598 100644 --- a/src/containers/Drawers/CreditNoteDetailDrawer/CreditNoteDetailFooter.js +++ b/src/containers/Drawers/CreditNoteDetailDrawer/CreditNoteDetailFooter.js @@ -19,7 +19,7 @@ export default function CreditNoteDetailFooter() { - }> + }> {creditNote.terms_conditions} diff --git a/src/containers/Drawers/InvoiceDetailDrawer/InvoiceDetailFooter.js b/src/containers/Drawers/InvoiceDetailDrawer/InvoiceDetailFooter.js index 5dfac3407..1c2c061cf 100644 --- a/src/containers/Drawers/InvoiceDetailDrawer/InvoiceDetailFooter.js +++ b/src/containers/Drawers/InvoiceDetailDrawer/InvoiceDetailFooter.js @@ -1,6 +1,12 @@ import React from 'react'; -import { CommercialDocFooter, If, DetailsMenu, DetailItem } from 'components'; +import { + CommercialDocFooter, + T, + If, + DetailsMenu, + DetailItem, +} from 'components'; import { useInvoiceDetailDrawerContext } from './InvoiceDetailDrawerProvider'; /** @@ -17,13 +23,13 @@ export function InvoiceDetailFooter() { - + }> {invoice.terms_conditions} - + }> {invoice.invoice_message} diff --git a/src/containers/TransactionsLocking/TransactionsLockingHeader.js b/src/containers/TransactionsLocking/TransactionsLockingHeader.js index 7eb897a06..877d81072 100644 --- a/src/containers/TransactionsLocking/TransactionsLockingHeader.js +++ b/src/containers/TransactionsLocking/TransactionsLockingHeader.js @@ -1,4 +1,5 @@ import React from 'react'; +import intl from 'react-intl-universal'; import { Intent } from '@blueprintjs/core'; import styled from 'styled-components'; @@ -57,8 +58,9 @@ export function TransactionsLockingHeader() { if (isAllLockingActive) { AppToaster.show({ - message: - 'You should unlock all transactions at once before, than lock transactions partially on each module.', + message: intl.get( + 'transactions_locking.you_should_unlock_all_transactions_at_once_before', + ), intent: Intent.DANGER, }); } else { @@ -79,7 +81,10 @@ export function TransactionsLockingHeader() { ) : ( - + } + intent={Intent.PRIMARY} + >

diff --git a/src/lang/ar/index.json b/src/lang/ar/index.json index b9c65d1b0..88d06af1a 100644 --- a/src/lang/ar/index.json +++ b/src/lang/ar/index.json @@ -1224,6 +1224,7 @@ "payment_receive.details.payment_number": "رقم العملية", "payment_receive.details.total": "إجمالي", "payment_receive.details.subtotal": "المجموع", + "payment_receive.details.statement": "بيان", "estimate.details.estimate_number": "رقم العرض", "estimate.details.subtotal": "المجموع", "estimate.details.total": "إجمالي", @@ -1231,11 +1232,14 @@ "estimate.details.due_amount": "مبلغ المستحق", "estimate.details.note": "ملاحظة", "estimate.details.created_at": "أنشئت في", + "estimate.details.terms_conditions": "الشروط والأحكام", "receipt.details.receipt_number": "رقم إيصال", "receipt.details.subtotal": "المجموع", "receipt.details.total": "إجمالي", "receipt.details.payment_amount": "مبلغ المدفوع", "receipt.details.due_amount": "مبلغ المستحق", + "receipt.details.receipt_message": "رسالة إيصال", + "receipt.details.statement": "بيان", "receipt.details.created_at": "أنشئت في", "bill.details.bill_number": "رقم الفاتورة", "bill.details.created_at": "أنشئت في", @@ -1250,6 +1254,7 @@ "invoice.details.due_amount": "مبلغ المستحق", "invoice.details.payment_amount": "مبلغ المدفوع", "invoice.details.invoice_no": "رقم الفاتورة", + "invoice.details.invoice_message": " رسالة الفاتورة ", "invoice_details.drawer.title": "تفاصيل الفاتورة البيع ({invoiceNumber}) ", "expense.details.subtotal": "المجموع", "expense.details.total": "إجمالي", @@ -1662,6 +1667,8 @@ "transactions_locking.callout.lock_individual.desc": "لديك القدرة على قفل معاملات جميع الوحدات مرة واحدة بدلاً من قفل كل وحدة جزئياً.", "transactions_locking.callout.lock_all_at_once.desc": "لديك القدرة على قفل أو إلغاء قفل المعاملات لكل وحدة على حدة بدلاً من قفل جميع المعاملات مرة واحدة. ", "transactions_locking.long_description": "قفل المعاملات لديه القدرة على قفل جميع معاملات المؤسسة حتى لا يتمكن المستخدمون من تعديل أو حذف أو إنشاء معاملات جديدة خلال الفترة الماضية ، ولكن لا يزال لديهم القدرة على إنشاء مسودات الفواتير الشراء أو البيع ولن يؤثر ذلك على التقارير المالية. عادةً ما تحدد تاريخ قفل عندما يتم إعداد سجلاتك المالية لهذا العام.", + "transactions_locking.you_should_unlock_all_transactions_at_once_before":".يجب عليك إلغاء قفل جميع المعاملات مرة واحدة ، بدلاً من قفل المعاملات كل وحدة جزئيًا", + "transactions_locking.lock_individual_modules":"قفل الوحدات الفردية ", "invoice_transactions.column.withdrawal_account": "حساب السحب", "invoice_transactions.action.delete_transaction": "حذف المعاملة ", "invoice_transactions.action.edit_transaction": " تعديل المعاملة", @@ -1724,7 +1731,7 @@ "permissions.vendors_summary_balance":"ملخص رصيد الموردين", "permissions.inventory_valuation_summary":"ملخص تقييم المخزون ", "permissions.inventory_items_details":"تفاصيل منتج المخزون", - "permissions.cashflow_account_transactions":"Cashflow account transactions", + "permissions.cashflow_account_transactions":"معاملات حسابات التدفقات النقدية", "permissions.more_permissions":"عرض المزيد " } diff --git a/src/lang/en/index.json b/src/lang/en/index.json index 7e0ea454d..752aa286c 100644 --- a/src/lang/en/index.json +++ b/src/lang/en/index.json @@ -1219,6 +1219,7 @@ "invoice.details.subtotal": "Subtotal", "invoice.details.due_amount": "Due amount", "invoice.details.payment_amount": "Payment amount", + "invoice.details.invoice_message": "Invoice Message", "invoice.details.invoice_no": "Invoice #", "bill.details.drawer.title":"Bill details", "bill.details.reference": "Reference #", @@ -1532,7 +1533,6 @@ "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", "vendor_credits.label.new_vendor_credit": "New Vendor Credit", @@ -1620,7 +1620,6 @@ "bills.error.you_couldn_t_delete_bill_has_reconciled_with_vendor_credit": "You couldn't delete bill has reconciled with vendor credit transaction.", "reconcile_vendor_credit.alert.success_message": "The applied vendor credit to bill has been deleted successfully", "reconcile_vendor_credit.alert.once_you_delete_this_reconcile_vendor_credit": "Once you delete this reconcile vendor credit note, you won't be able to restore it later. Are you sure you want to delete this reconcile vendor credit note?", - "sidebar.transactions_locaking": "Transactions Locking", "locking_transactions.dialog.label": "Locking transactions", "locking_transactions.dialog.locking_date": "Locking date", @@ -1654,6 +1653,8 @@ "transactions_locking.callout.lock_individual.desc": "You have the ability to lock transactions of all modules at once instead of locking transactions each module​​ partially.", "transactions_locking.callout.lock_all_at_once.desc": "You have the ability to lock or unlock transactions of each module individually instead of locking all transactions at once.", "transactions_locking.long_description": "Transactions locking has the ability to lock all organization transactions so users can’t edit, delete or create new transactions during the past period, but still have the ability to create draft invoices or bills and that won’t affect financial reports. typically set a lock date when your financial records are being prepared for the year.", + "transactions_locking.you_should_unlock_all_transactions_at_once_before":"You should unlock all transactions at once before, than lock transactions partially on each module.", + "transactions_locking.lock_individual_modules":"Lock Individual Modules", "payment_transactions": "Payment transactions", "invoice_transactions.column.withdrawal_account": "Deposit account", "invoice_transactions.action.delete_transaction": "Delete Transaction",