- Here a list of your organization products and services, to be used
- when you create invoices or bills to your customers or vendors.
+
}
action={
@@ -24,11 +24,11 @@ export default function CustomersEmptyStatus() {
history.push('/customers/new');
}}
>
- New customer
+
>
}
diff --git a/client/src/containers/InventoryAdjustments/InventoryAdjustmentTable.js b/client/src/containers/InventoryAdjustments/InventoryAdjustmentTable.js
index 24f9416d7..81e5c464f 100644
--- a/client/src/containers/InventoryAdjustments/InventoryAdjustmentTable.js
+++ b/client/src/containers/InventoryAdjustments/InventoryAdjustmentTable.js
@@ -1,6 +1,7 @@
import React, { useCallback } from 'react';
import { DataTable } from 'components';
import { useInventoryAdjustmentsColumns, ActionsMenu } from './components';
+import { formatMessage } from 'services/intl';
import withAlertsActions from 'containers/Alert/withAlertActions';
import withInventoryAdjustmentActions from './withInventoryAdjustmentActions';
@@ -23,14 +24,14 @@ function InventoryAdjustmentDataTable({
openAlert,
// #ownProps
- tableProps
+ tableProps,
}) {
const {
isAdjustmentsLoading,
isAdjustmentsFetching,
inventoryAdjustments,
- pagination
+ pagination,
} = useInventoryAdjustmentsContext();
// Handle delete inventory adjustment transaction.
@@ -47,40 +48,35 @@ function InventoryAdjustmentDataTable({
setInventoryAdjustmentTableState({
pageSize,
pageIndex,
- sortBy
- })
+ sortBy,
+ });
},
[setInventoryAdjustmentTableState],
);
- return (
+ return (
);
diff --git a/client/src/containers/Items/ItemsEmptyStatus.js b/client/src/containers/Items/ItemsEmptyStatus.js
index 01682e478..dc956ad5a 100644
--- a/client/src/containers/Items/ItemsEmptyStatus.js
+++ b/client/src/containers/Items/ItemsEmptyStatus.js
@@ -2,16 +2,17 @@ import React from 'react';
import { Button, Intent } from '@blueprintjs/core';
import { useHistory } from 'react-router-dom';
import { EmptyStatus } from 'components';
+import { FormattedMessage as T } from 'react-intl';
export default function ItemsEmptyStatus() {
const history = useHistory();
return (
}
description={
- Here a list of your organization products and services, to be used when you create invoices or bills to your customers or vendors.
+
}
action={
@@ -23,11 +24,11 @@ export default function ItemsEmptyStatus() {
history.push('/items/new');
}}
>
- New Item
+
>
}
diff --git a/client/src/containers/Purchases/Bills/BillForm/BillFormFooter.js b/client/src/containers/Purchases/Bills/BillForm/BillFormFooter.js
index 4c34a5ba6..5add2a1a1 100644
--- a/client/src/containers/Purchases/Bills/BillForm/BillFormFooter.js
+++ b/client/src/containers/Purchases/Bills/BillForm/BillFormFooter.js
@@ -12,7 +12,7 @@ import { inputIntent } from 'utils';
export default function BillFormFooter() {
return (
-
+ } defaultOpen={false}>
@@ -33,7 +33,7 @@ export default function BillFormFooter() {
initialFiles={[]}
// onDrop={onDropFiles}
// onDeleteFile={onDropFiles}
- hint={'Attachments: Maxiumum size: 20MB'}
+ hint={}
/>
diff --git a/client/src/containers/Purchases/Bills/BillForm/BillFormHeader.js b/client/src/containers/Purchases/Bills/BillForm/BillFormHeader.js
index ea8ac2aeb..eeaac3f5d 100644
--- a/client/src/containers/Purchases/Bills/BillForm/BillFormHeader.js
+++ b/client/src/containers/Purchases/Bills/BillForm/BillFormHeader.js
@@ -2,6 +2,7 @@ import React, { useMemo } from 'react';
import classNames from 'classnames';
import { sumBy } from 'lodash';
import { useFormikContext } from 'formik';
+import { formatMessage } from 'services/intl';
import { CLASSES } from 'common/classes';
@@ -28,7 +29,7 @@ function BillFormHeader({
diff --git a/client/src/containers/Purchases/Bills/BillsLanding/BillsEmptyStatus.js b/client/src/containers/Purchases/Bills/BillsLanding/BillsEmptyStatus.js
index fd42a941d..f0e13918e 100644
--- a/client/src/containers/Purchases/Bills/BillsLanding/BillsEmptyStatus.js
+++ b/client/src/containers/Purchases/Bills/BillsLanding/BillsEmptyStatus.js
@@ -2,16 +2,17 @@ import React from 'react';
import { Button, Intent } from '@blueprintjs/core';
import { useHistory } from 'react-router-dom';
import { EmptyStatus } from 'components';
+import { FormattedMessage as T } from 'react-intl';
export default function BillsEmptyStatus() {
const history = useHistory();
return (
}
description={
- Here a list of your organization products and services, to be used when you create invoices or bills to your customers or vendors.
+
}
action={
@@ -23,11 +24,11 @@ export default function BillsEmptyStatus() {
history.push('/bills/new');
}}
>
- New bill
+
>
}
diff --git a/client/src/containers/Purchases/PaymentMades/PaymentForm/PaymentMadeEntriesTable.js b/client/src/containers/Purchases/PaymentMades/PaymentForm/PaymentMadeEntriesTable.js
index 2a7383042..5273d8eee 100644
--- a/client/src/containers/Purchases/PaymentMades/PaymentForm/PaymentMadeEntriesTable.js
+++ b/client/src/containers/Purchases/PaymentMades/PaymentForm/PaymentMadeEntriesTable.js
@@ -1,6 +1,7 @@
import React, { useCallback } from 'react';
import { CloudLoadingIndicator } from 'components';
import classNames from 'classnames';
+import { FormattedMessage as T } from 'react-intl';
import { CLASSES } from 'common/classes';
import { DataTableEditable } from 'components';
@@ -42,9 +43,15 @@ export default function PaymentMadeEntriesTable({
// Detarmines the right no results message before selecting vendor and aftering
// selecting vendor id.
- const noResultsMessage = vendor_id
- ? 'There is no payable bills for this vendor that can be applied for this payment'
- : 'Please select a vendor to display all open bills for it.';
+ const noResultsMessage = vendor_id ? (
+
+ ) : (
+
+ );
return (
diff --git a/client/src/containers/Purchases/PaymentMades/PaymentForm/PaymentMadeFooter.js b/client/src/containers/Purchases/PaymentMades/PaymentForm/PaymentMadeFooter.js
index ae1156448..e74a536e6 100644
--- a/client/src/containers/Purchases/PaymentMades/PaymentForm/PaymentMadeFooter.js
+++ b/client/src/containers/Purchases/PaymentMades/PaymentForm/PaymentMadeFooter.js
@@ -12,7 +12,7 @@ import { CLASSES } from 'common/classes';
export default function PaymentMadeFooter() {
return (
-
+ } defaultOpen={false}>
{/* --------- Statement --------- */}
diff --git a/client/src/containers/Purchases/PaymentMades/PaymentForm/PaymentMadeFormHeader.js b/client/src/containers/Purchases/PaymentMades/PaymentForm/PaymentMadeFormHeader.js
index 528524842..ebde8ccc8 100644
--- a/client/src/containers/Purchases/PaymentMades/PaymentForm/PaymentMadeFormHeader.js
+++ b/client/src/containers/Purchases/PaymentMades/PaymentForm/PaymentMadeFormHeader.js
@@ -4,9 +4,9 @@ import { useFormikContext } from 'formik';
import { sumBy } from 'lodash';
import { CLASSES } from 'common/classes';
import { compose } from 'utils';
-import {
- Money,
-} from 'components';
+import { Money } from 'components';
+import { FormattedMessage as T } from 'react-intl';
+
import PaymentMadeFormHeaderFields from './PaymentMadeFormHeaderFields';
import withSettings from 'containers/Settings/withSettings';
@@ -18,7 +18,9 @@ function PaymentMadeFormHeader({
baseCurrency,
}) {
// Formik form context.
- const { values: { entries } } = useFormikContext();
+ const {
+ values: { entries },
+ } = useFormikContext();
// Calculate the payment amount of the entries.
const amountPaid = useMemo(() => sumBy(entries, 'payment_amount'), [entries]);
@@ -30,7 +32,9 @@ function PaymentMadeFormHeader({
- Amount Received
+
+
+
diff --git a/client/src/containers/Purchases/PaymentMades/PaymentForm/PaymentMadeFormHeaderFields.js b/client/src/containers/Purchases/PaymentMades/PaymentForm/PaymentMadeFormHeaderFields.js
index d107cdb5e..08a5442f2 100644
--- a/client/src/containers/Purchases/PaymentMades/PaymentForm/PaymentMadeFormHeaderFields.js
+++ b/client/src/containers/Purchases/PaymentMades/PaymentForm/PaymentMadeFormHeaderFields.js
@@ -157,7 +157,7 @@ function PaymentMadeFormHeaderFields({ baseCurrency }) {
small={true}
minimal={true}
>
- Receive full amount (
+ (
)
diff --git a/client/src/containers/Purchases/PaymentMades/PaymentsLanding/PaymentMadesEmptyStatus.js b/client/src/containers/Purchases/PaymentMades/PaymentsLanding/PaymentMadesEmptyStatus.js
index 8ed4582af..fbe55af9c 100644
--- a/client/src/containers/Purchases/PaymentMades/PaymentsLanding/PaymentMadesEmptyStatus.js
+++ b/client/src/containers/Purchases/PaymentMades/PaymentsLanding/PaymentMadesEmptyStatus.js
@@ -2,17 +2,17 @@ import React from 'react';
import { Button, Intent } from '@blueprintjs/core';
import { useHistory } from 'react-router-dom';
import { EmptyStatus } from 'components';
+import { FormattedMessage as T } from 'react-intl';
export default function PaymentMadesEmptyStatus() {
const history = useHistory();
return (
}
description={
- It is a long established fact that a reader will be distracted by the
- readable content of a page when looking at its layout.
+
}
action={
@@ -24,11 +24,11 @@ export default function PaymentMadesEmptyStatus() {
history.push('/payment-mades/new');
}}
>
- New bill payment
+
>
}
diff --git a/client/src/containers/Sales/Invoices/InvoicesLanding/InvoicesEmptyStatus.js b/client/src/containers/Sales/Invoices/InvoicesLanding/InvoicesEmptyStatus.js
index 80bd64d3b..bf7da7463 100644
--- a/client/src/containers/Sales/Invoices/InvoicesLanding/InvoicesEmptyStatus.js
+++ b/client/src/containers/Sales/Invoices/InvoicesLanding/InvoicesEmptyStatus.js
@@ -1,37 +1,37 @@
- import React from 'react';
- import { Button, Intent } from '@blueprintjs/core';
- import { useHistory } from 'react-router-dom';
- import { EmptyStatus } from 'components';
+import React from 'react';
+import { Button, Intent } from '@blueprintjs/core';
+import { useHistory } from 'react-router-dom';
+import { EmptyStatus } from 'components';
+import { FormattedMessage as T } from 'react-intl';
- export default function EstimatesEmptyStatus() {
- const history = useHistory();
+export default function EstimatesEmptyStatus() {
+ const history = useHistory();
- return (
-
- It is a long established fact that a reader will be distracted by the
- readable content of a page when looking at its layout.
-
- }
- action={
- <>
-
+ return (
+ }
+ description={
+
- Here a list of your organization products and services, to be used
- when you create invoices or bills to your customers or vendors.
+
}
action={
@@ -24,11 +24,11 @@ export default function VendorsEmptyStatus() {
history.push('/vendors/new');
}}
>
- New vendor
+
>
}
diff --git a/client/src/lang/en/index.json b/client/src/lang/en/index.json
index ec4e325f1..22f9dc06f 100644
--- a/client/src/lang/en/index.json
+++ b/client/src/lang/en/index.json
@@ -902,7 +902,6 @@
"manage_your_products_inventory_or_non_inventory": "Manage your products (inventory or non-inventory) and services and place them into categories.",
"products_services_categories": "Products & Services Categories",
"group_your_products_and_service": "Group your products and service into different categories.",
- "inventory_adjustments": "Inventory Adjustments",
"manage_your_inventory_adjustment_of_inventory_items": "Manage your inventory adjustment of inventory items.",
"page_size": "Page size",
"there_is_no_items_categories_in_table_yet": "There is no items categories in table yet.",
@@ -927,9 +926,25 @@
"setting_your_auto_generated_invoice_number": "Setting your auto-generated invoice number",
"setting_your_auto_generated_payment_receive_number": "Setting your auto-generated Payment Receive number",
"the_organization_doesn_t_receive_money_yet": "The organization doesn't receive money, yet!",
- "new_payment_receive": "New payment receive",
"there_is_no_receivable_invoices_for_this_customer": "There is no receivable invoices for this customer that can be applied for this payment",
"please_select_a_customer_to_display_all_open_invoices_for_it": "Please select a customer to display all open invoices for it.",
"payment_receive_details": "Payment receive details",
- "receive_full_amount": "Receive full amount"
+ "receive_full_amount": "Receive full amount",
+ "manage_the_organization_s_services_and_products": "Manage the organization’s services and products.",
+ "here_a_list_of_your_organization_products_and_services": " Here a list of your organization products and services, to be used when you create invoices or bills to your customers or vendors.",
+ "receipt_details": "Receipt details",
+ "bill_details": "Bill details",
+ "new_bill_payment": "New bill payment",
+ "new_sale_invoice": " New sale invoice",
+ "there_is_no_payable_bills_for_this_vendor_that_can_be_applied_for_this_payment": "There is no payable bills for this vendor that can be applied for this payment",
+ "please_select_a_vendor_to_display_all_open_bills_for_it": "Please select a vendor to display all open bills for it.",
+ "payment_made_details": "Payment made details",
+ "there_is_no_inventory_adjustments_transactions_yet":"There is no inventory adjustments transactions yet.",
+ "create_and_manage_your_organization_s_customers":"Create and manage your organization's customers.",
+ "salutation":"Salutation",
+ "work":"work",
+ "mobile":"Mobile",
+ "phone":"Phone",
+ "create_and_manage_your_organization_s_vendors":"Create and manage your organization's vendors."
+
}
\ No newline at end of file
diff --git a/server/.env.example b/server/.env.example
index 31287ed5d..cc54ba76b 100644
--- a/server/.env.example
+++ b/server/.env.example
@@ -26,7 +26,6 @@ DB_MANAGER_SUPER_PASSWORD=root
MONGODB_DATABASE_URL=mongodb://localhost/bigcapital
-EASY_SMS_TOKEN=b0JDZW56RnV6aEthb0RGPXVEcUI
JWT_SECRET=b0JDZW56RnV6aEthb0RGPXVEcUI