diff --git a/src/common/moreVertOptions.js b/src/common/moreVertOptions.js index 62a15a755..d3a2564c8 100644 --- a/src/common/moreVertOptions.js +++ b/src/common/moreVertOptions.js @@ -2,11 +2,11 @@ import intl from 'react-intl-universal'; export const moreVertOptions = [ { - name: intl.get('badDebt.label'), + name: intl.get('bad_debt.dialog.bad_debt'), value: 'bad debt', }, { - name: intl.get('badDebt.label_cancel_bad_debt'), + name: intl.get('bad_debt.dialog.cancel_bad_debt'), value: 'cancel bad debt', }, ]; diff --git a/src/containers/Alerts/Invoices/CancelBadDebtAlert.js b/src/containers/Alerts/Invoices/CancelBadDebtAlert.js index 6bbe29994..2e1a914cd 100644 --- a/src/containers/Alerts/Invoices/CancelBadDebtAlert.js +++ b/src/containers/Alerts/Invoices/CancelBadDebtAlert.js @@ -35,7 +35,7 @@ function CancelBadDebtAlert({ cancelBadDebtMutate(invoiceId) .then(() => { AppToaster.show({ - message: intl.get('badDebt_canceled_write_off_success_message'), + message: intl.get('bad_debt.cancel_alert.success_message'), intent: Intent.SUCCESS, }); }) @@ -56,7 +56,7 @@ function CancelBadDebtAlert({ loading={isLoading} >

- +

); diff --git a/src/containers/Dialogs/BadDebtDialog/BadDebtForm.js b/src/containers/Dialogs/BadDebtDialog/BadDebtForm.js index bd2d7696e..8e521e6f2 100644 --- a/src/containers/Dialogs/BadDebtDialog/BadDebtForm.js +++ b/src/containers/Dialogs/BadDebtDialog/BadDebtForm.js @@ -50,7 +50,7 @@ function BadDebtForm({ // Handle request response success. const onSuccess = (response) => { AppToaster.show({ - message: intl.get('badDebt_writte_off_success_message'), + message: intl.get('bad_debt.dialog.success_message'), intent: Intent.SUCCESS, }); closeDialog(dialogName); diff --git a/src/containers/Dialogs/BadDebtDialog/BadDebtFormFields.js b/src/containers/Dialogs/BadDebtDialog/BadDebtFormFields.js index 2d52b4a3c..a5bc69d07 100644 --- a/src/containers/Dialogs/BadDebtDialog/BadDebtFormFields.js +++ b/src/containers/Dialogs/BadDebtDialog/BadDebtFormFields.js @@ -36,7 +36,7 @@ function BadDebtFormFields() {

- +

@@ -48,7 +48,7 @@ function BadDebtFormFields() { meta: { error, touched }, }) => ( } + label={} labelInfo={} className={classNames('form-group--amount', CLASSES.FILL)} intent={inputIntent({ error, touched })} diff --git a/src/containers/Dialogs/BadDebtDialog/index.js b/src/containers/Dialogs/BadDebtDialog/index.js index 7641bfb03..016645dcf 100644 --- a/src/containers/Dialogs/BadDebtDialog/index.js +++ b/src/containers/Dialogs/BadDebtDialog/index.js @@ -14,7 +14,7 @@ function BadDebtDialog({ dialogName, payload: { invoiceId = null }, isOpen }) { return ( } + title={} isOpen={isOpen} canEscapeJeyClose={true} autoFocus={true} diff --git a/src/containers/Drawers/InvoiceDetailDrawer/utils.js b/src/containers/Drawers/InvoiceDetailDrawer/utils.js index 426d5c4c3..26d219e9d 100644 --- a/src/containers/Drawers/InvoiceDetailDrawer/utils.js +++ b/src/containers/Drawers/InvoiceDetailDrawer/utils.js @@ -72,12 +72,15 @@ export const BadDebtMenuItem = ({ invoice, onDialog, onAlert }) => { - } onClick={onDialog} /> + } + onClick={onDialog} + /> } + text={} /> diff --git a/src/lang/ar/index.json b/src/lang/ar/index.json index c7fda276f..f5c145998 100644 --- a/src/lang/ar/index.json +++ b/src/lang/ar/index.json @@ -1433,13 +1433,13 @@ "cash_flow_money_out": "سحب", "cash_flow_transaction.switch_item": " {value} معاملة علي حساب", "cash_flow_transaction.balance_in_bigcapital": "الرصيد في Bigcapital", - "badDebt.label_written_off_amount": "المبلغ المشطوب", - "badDebt.label": "الديون المعدومة", - "badDebt.label_cancel_bad_debt": "إلغاء الديون المعدومة", - "badDebt_the_seller_can_charge_the_amount_of_an_invoice": "يمكن للبائع تحميل مبلغ الفاتورة على حساب مصروفات الديون المعدومة عندما يكون من المؤكد أن الفاتورة لن يتم دفعها.", - "badDebt_writte_off_success_message":"تم شطب فاتورة البيع المقدمة بنجاح.", - "badDebt_canceled_write_off_success_message":"تم إلغاء شطب فاتورة البيع المقدمة بنجاح.", - "badDebt_are_sure_to_write_off_this_invoice": "هل أنت متأكد أنك تريد شطب هذه الفاتورة؟ " + "bad_debt.dialog.written_off_amount": "المبلغ المشطوب", + "bad_debt.dialog.bad_debt": "الديون المعدومة", + "bad_debt.dialog.cancel_bad_debt": "إلغاء الديون المعدومة", + "bad_debt.dialog.header_note": "يمكن للبائع تحميل مبلغ الفاتورة على حساب مصروفات الديون المعدومة عندما يكون من المؤكد أن الفاتورة لن يتم دفعها.", + "bad_debt.dialog.success_message":"تم شطب فاتورة البيع المقدمة بنجاح.", + "bad_debt.cancel_alert.success_message":"تم إلغاء شطب فاتورة البيع المقدمة بنجاح.", + "bad_debt.cancel_alert.message": "هل أنت متأكد أنك تريد شطب هذه الفاتورة؟ " } \ No newline at end of file diff --git a/src/lang/en/index.json b/src/lang/en/index.json index cb07a2c6e..34dacf23f 100644 --- a/src/lang/en/index.json +++ b/src/lang/en/index.json @@ -1421,12 +1421,12 @@ "item.error.type_cannot_change_with_item_has_transactions": "Cannot change item type to inventory with item has associated transactions.", "item.error.cannot_change_inventory_account": "Cannot change item inventory account while the item has transactions.", "customer.link.customer_details": "Customer details ({amount})", - "badDebt.label_written_off_amount": "Written-off amount", - "badDebt.label": "Bad debt", - "badDebt.label_cancel_bad_debt": "Cancel bad debt", - "badDebt_the_seller_can_charge_the_amount_of_an_invoice": "The seller can charge the amount of an invoice to the bad debt expense account when it is certain that the invoice will not be paid.", - "badDebt_writte_off_success_message":"The given sale invoice has been writte-off successfully.", - "badDebt_canceled_write_off_success_message":"The given sale invoice has been canceled write-off successfully.", - "badDebt_are_sure_to_write_off_this_invoice": "Are you sure you want to write off this invoice?" + "bad_debt.dialog.written_off_amount": "Written-off amount", + "bad_debt.dialog.bad_debt": "Bad debt", + "bad_debt.dialog.cancel_bad_debt": "Cancel bad debt", + "bad_debt.dialog.header_note": "The seller can charge the amount of an invoice to the bad debt expense account when it is certain that the invoice will not be paid.", + "bad_debt.dialog.success_message":"The given sale invoice has been writte-off successfully.", + "bad_debt.cancel_alert.success_message":"The given sale invoice has been canceled write-off successfully.", + "bad_debt.cancel_alert.message": "Are you sure you want to write off this invoice?" -} \ No newline at end of file +}