chore: renmame payment receive term to payment received

packages/server/src/loaders/events.ts

@@ -34,4 +34,4 @@
 // import 'services/Sales/SaleInvoiceWriteoffSubscriber';
 // import 'subscribers/SaleInvoices/SendSmsNotificationToCustomer';
 // import 'subscribers/SaleReceipt/SendNotificationToCustomer';
-// import 'services/Sales/PaymentReceives/PaymentReceiveSmsSubscriber';
+// import 'services/Sales/PaymentReceived/PaymentReceiveSmsSubscriber';

packages/webapp/src/components/DialogsContainer.tsx

@@ -49,7 +49,7 @@ import InvoiceExchangeRateChangeDialog from '@/containers/Sales/Invoices/Invoice
 import InvoiceMailDialog from '@/containers/Sales/Invoices/InvoiceMailDialog/InvoiceMailDialog';
 import EstimateMailDialog from '@/containers/Sales/Estimates/EstimateMailDialog/EstimateMailDialog';
 import ReceiptMailDialog from '@/containers/Sales/Receipts/ReceiptMailDialog/ReceiptMailDialog';
-import PaymentMailDialog from '@/containers/Sales/PaymentReceives/PaymentMailDialog/PaymentMailDialog';
+import PaymentMailDialog from '@/containers/Sales/PaymentsReceived/PaymentMailDialog/PaymentMailDialog';
 import { ExportDialog } from '@/containers/Dialogs/ExportDialog';
 import { RuleFormDialog } from '@/containers/Banking/Rules/RuleFormDialog/RuleFormDialog';
 import { DisconnectBankAccountDialog } from '@/containers/CashFlow/AccountTransactions/dialogs/DisconnectBankAccountDialog/DisconnectBankAccountDialog';

packages/webapp/src/components/DrawersContainer.tsx

@@ -39,7 +39,7 @@ export default function DrawersContainer() {
       <InvoiceDetailDrawer name={DRAWERS.INVOICE_DETAILS} />
       <EstimateDetailDrawer name={DRAWERS.ESTIMATE_DETAILS} />
       <ReceiptDetailDrawer name={DRAWERS.RECEIPT_DETAILS} />
-      <PaymentReceiveDetailDrawer name={DRAWERS.PAYMENT_RECEIVE_DETAILS} />
+      <PaymentReceiveDetailDrawer name={DRAWERS.PAYMENT_RECEIVED_DETAILS} />
       <PaymentMadeDetailDrawer name={DRAWERS.PAYMENT_MADE_DETAILS} />
       <ItemDetailDrawer name={DRAWERS.ITEM_DETAILS} />
       <CustomerDetailsDrawer name={DRAWERS.CUSTOMER_DETAILS} />

packages/webapp/src/constants/drawers.ts

@@ -6,7 +6,7 @@ export enum DRAWERS {
   BILL_DETAILS = 'bill-drawer',
   INVOICE_DETAILS = 'invoice-detail-drawer',
   RECEIPT_DETAILS = 'receipt-detail-drawer',
-  PAYMENT_RECEIVE_DETAILS = 'payment-receive-detail-drawer',
+  PAYMENT_RECEIVED_DETAILS = 'payment-receive-detail-drawer',
   PAYMENT_MADE_DETAILS = 'payment-made-drawer',
   ESTIMATE_DETAILS = 'estimate-detail-drawer',
   ITEM_DETAILS = 'item-detail-drawer',

packages/webapp/src/constants/homepageOptions.tsx

@@ -55,7 +55,7 @@ export const accountsReceivable = [
         description: (
           <T id={'manage_payment_transactions_from_your_customers'} />
         ),
-        link: '/payment-receives',
+        link: '/payments-received',
         subject: AbilitySubject.PaymentReceive,
         ability: PaymentReceiveAction.View,
       },

packages/webapp/src/constants/sidebarMenu.tsx

@@ -179,8 +179,8 @@ export const SidebarMenu = [
             type: ISidebarMenuItemType.Link,
           },
           {
-            text: <T id={'sidebar.payment_receives'} />,
+            text: <T id={'sidebar.payments_received'} />,
-            href: '/payment-receives',
+            href: '/payments-received',
             type: ISidebarMenuItemType.Link,
             permission: {
               subject: AbilitySubject.PaymentReceive,
@@ -226,8 +226,8 @@ export const SidebarMenu = [
             type: ISidebarMenuItemType.Link,
           },
           {
-            text: <T id={'sidebar.new_payment_receive'} />,
+            text: <T id={'sidebar.new_payment_received'} />,
-            href: '/payment-receives/new',
+            href: '/payment-received/new',
             type: ISidebarMenuItemType.Link,
             permission: {
               subject: AbilitySubject.PaymentReceive,

packages/webapp/src/containers/Alerts/PaymentReceived/PaymentReceivedDeleteAlert.tsx

@@ -21,7 +21,7 @@ import { DRAWERS } from '@/constants/drawers';
 /**
  * Payment receive delete alert.
  */
-function PaymentReceiveDeleteAlert({
+function PaymentReceivedDeleteAlert({
   name,
 
   // #withAlertStoreConnect
@@ -48,11 +48,11 @@ function PaymentReceiveDeleteAlert({
       .then(() => {
         AppToaster.show({
           message: intl.get(
-            'the_payment_receive_has_been_deleted_successfully',
+            'the_payment_received_has_been_deleted_successfully',
           ),
           intent: Intent.SUCCESS,
         });
-        closeDrawer(DRAWERS.PAYMENT_RECEIVE_DETAILS);
+        closeDrawer(DRAWERS.PAYMENT_RECEIVED_DETAILS);
       })
       .catch(
         ({
@@ -81,7 +81,7 @@ function PaymentReceiveDeleteAlert({
     >
       <p>
         <FormattedHTMLMessage
-          id={'once_delete_this_payment_receive_you_will_able_to_restore_it'}
+          id={'once_delete_this_payment_received_you_will_able_to_restore_it'}
         />
       </p>
     </Alert>
@@ -92,4 +92,4 @@ export default compose(
   withAlertStoreConnect(),
   withAlertActions,
   withDrawerActions,
-)(PaymentReceiveDeleteAlert);
+)(PaymentReceivedDeleteAlert);

packages/webapp/src/containers/AlertsContainer/registered.tsx

@@ -6,7 +6,7 @@ import InventoryAdjustmentsAlerts from '@/containers/InventoryAdjustments/Invent
 import EstimatesAlerts from '@/containers/Sales/Estimates/EstimatesAlerts';
 import InvoicesAlerts from '@/containers/Sales/Invoices/InvoicesAlerts';
 import ReceiptsAlerts from '@/containers/Sales/Receipts/ReceiptsAlerts';
-import PaymentReceiveAlerts from '@/containers/Sales/PaymentReceives/PaymentReceiveAlerts';
+import PaymentsReceivedAlerts from '@/containers/Sales/PaymentsReceived/PaymentsReceivedAlerts';
 import BillsAlerts from '@/containers/Purchases/Bills/BillsLanding/BillsAlerts';
 import PaymentMadesAlerts from '@/containers/Purchases/PaymentMades/PaymentMadesAlerts';
 import CustomersAlerts from '@/containers/Customers/CustomersAlerts';
@@ -38,7 +38,7 @@ export default [
   ...EstimatesAlerts,
   ...InvoicesAlerts,
   ...ReceiptsAlerts,
-  ...PaymentReceiveAlerts,
+  ...PaymentsReceivedAlerts,
   ...BillsAlerts,
   ...PaymentMadesAlerts,
   ...CustomersAlerts,

packages/webapp/src/containers/CashFlow/AccountTransactions/utils.tsx

@@ -66,7 +66,7 @@ export const handleCashFlowTransactionType = (reference, openDrawer) => {
         expenseId: reference.reference_id,
       });
     case 'PaymentReceive':
-      return openDrawer(DRAWERS.PAYMENT_RECEIVE_DETAILS, {
+      return openDrawer(DRAWERS.PAYMENT_RECEIVED_DETAILS, {
         paymentReceiveId: reference.reference_id,
       });
     case 'BillPayment':

packages/webapp/src/containers/Dialogs/PaymentReceivePdfPreviewDialog/index.tsx

@@ -25,7 +25,7 @@ function PaymentReceivePdfPreviewDialog({
   return (
     <Dialog
       name={dialogName}
-      title={<T id={'payment_receive_preview.dialog.title'} />}
+      title={<T id={'payment_received_preview.dialog.title'} />}
       className={classNames(CLASSES.DIALOG_PDF_PREVIEW)}
       autoFocus={true}
       canEscapeKeyClose={true}

packages/webapp/src/containers/Dialogs/QuickPaymentReceiveFormDialog/QuickPaymentReceive.schema.tsx

@@ -9,7 +9,7 @@ const Schema = Yup.object().shape({
     .required()
     .nullable()
     .max(DATATYPES_LENGTH.STRING)
-    .label(intl.get('payment_receive_no_')),
+    .label(intl.get('payment_received_no_')),
   payment_date: Yup.date().required().label(intl.get('payment_date_')),
   deposit_account_id: Yup.number()
     .required()

packages/webapp/src/containers/Dialogs/QuickPaymentReceiveFormDialog/QuickPaymentReceiveForm.tsx

@@ -70,7 +70,7 @@ function QuickPaymentReceiveForm({
     // Handle request response success.
     const onSaved = (response) => {
       AppToaster.show({
-        message: intl.get('the_payment_receive_transaction_has_been_created'),
+        message: intl.get('the_payment_received_transaction_has_been_created'),
         intent: Intent.SUCCESS,
       });
       closeDialog(dialogName);

packages/webapp/src/containers/Dialogs/QuickPaymentReceiveFormDialog/utils.tsx

@@ -34,7 +34,7 @@ export const transformErrors = (errors, { setFieldError }) => {
   if (getError('PAYMENT_RECEIVE_NO_REQUIRED')) {
     setFieldError(
       'payment_receive_no',
-      intl.get('payment_receive_number_required'),
+      intl.get('payment_received_number_required'),
     );
   }
   if (getError('INVALID_PAYMENT_AMOUNT')) {

packages/webapp/src/containers/Drawers/CustomerDetailsDrawer/CustomerDetailsActionsBar.tsx

@@ -68,7 +68,7 @@ function CustomerDetailsActionsBar({
   };
   // Handle new payment receive button click.
   const handleNewPaymentClick = () => {
-    history.push('/payment-receives/new');
+    history.push('/payment-received/new');
     closeDrawer(DRAWERS.CUSTOMER_DETAILS);
   };
   // Handle new estimate button click.

packages/webapp/src/containers/Drawers/InvoiceDetailDrawer/InvoicePaymentTransactions/InvoicePaymentTransactionsTable.tsx

@@ -47,14 +47,14 @@ function InvoicePaymentTransactionsTable({
 
   // Handles delete payment transactions.
   const handleDeletePaymentTransactons = ({ payment_receive_id }) => {
-    openAlert('payment-receive-delete', {
+    openAlert('payment-received-delete', {
       paymentReceiveId: payment_receive_id,
     });
   };
 
   // Handles edit payment transactions.
   const handleEditPaymentTransactions = ({ payment_receive_id }) => {
-    history.push(`/payment-receives/${payment_receive_id}/edit`);
+    history.push(`/payments-received/${payment_receive_id}/edit`);
     closeDrawer(DRAWERS.INVOICE_DETAILS);
   };
   return (

packages/webapp/src/containers/Drawers/PaymentReceiveDetailDrawer/PaymentReceiveActionsBar.tsx

@@ -33,7 +33,7 @@ import { DialogsName } from '@/constants/dialogs';
 /**
  * Payment receive actions bar.
  */
-function PaymentReceiveActionsBar({
+function PaymentsReceivedActionsBar({
   // #withAlertsActions
   openAlert,
 
@@ -50,13 +50,13 @@ function PaymentReceiveActionsBar({
 
   // Handle edit payment receive.
   const handleEditPaymentReceive = () => {
-    history.push(`/payment-receives/${paymentReceiveId}/edit`);
+    history.push(`/payments-received/${paymentReceiveId}/edit`);
-    closeDrawer(DRAWERS.PAYMENT_RECEIVE_DETAILS);
+    closeDrawer(DRAWERS.PAYMENT_RECEIVED_DETAILS);
   };
 
   // Handle delete payment receive.
   const handleDeletePaymentReceive = () => {
-    openAlert('payment-receive-delete', { paymentReceiveId });
+    openAlert('payment-received-delete', { paymentReceiveId });
   };
 
   // Handle notify via SMS.
@@ -80,7 +80,7 @@ function PaymentReceiveActionsBar({
           <Button
             className={Classes.MINIMAL}
             icon={<Icon icon="pen-18" />}
-            text={<T id={'edit_payment_receive'} />}
+            text={<T id={'edit_payment_received'} />}
             onClick={handleEditPaymentReceive}
           />
           <NavbarDivider />
@@ -129,4 +129,4 @@ export default compose(
   withDialogActions,
   withDrawerActions,
   withAlertsActions,
-)(PaymentReceiveActionsBar);
+)(PaymentsReceivedActionsBar);

packages/webapp/src/containers/Drawers/PaymentReceiveDetailDrawer/PaymentReceiveDetailProvider.tsx

@@ -35,13 +35,13 @@ function PaymentReceiveDetailProvider({ paymentReceiveId, ...props }) {
   return (
     <DrawerLoading loading={isPaymentLoading}>
       <DrawerHeaderContent
-        name={DRAWERS.PAYMENT_RECEIVE_DETAILS}
+        name={DRAWERS.PAYMENT_RECEIVED_DETAILS}
-        title={intl.get('payment_receive.drawer.title', {
+        title={intl.get('payment_received.drawer.title', {
           number: paymentReceive.payment_receive_no,
         })}
         subTitle={
           featureCan(Features.Branches)
-            ? intl.get('payment_receive.drawer.subtitle', {
+            ? intl.get('payment_received.drawer.subtitle', {
                 value: paymentReceive.branch?.name,
               })
             : null

packages/webapp/src/containers/Sales/PaymentReceives/PaymentReceiveAlerts.tsx

@@ -1,13 +0,0 @@
-// @ts-nocheck
-import React from 'react';
-
-const PaymentReceiveDeleteAlert = React.lazy(
-  () => import('@/containers/Alerts/PaymentReceives/PaymentReceiveDeleteAlert'),
-);
-
-/**
- * PaymentReceives alert.
- */
-export default [
-  { name: 'payment-receive-delete', component: PaymentReceiveDeleteAlert },
-];

packages/webapp/src/containers/Sales/PaymentsReceived/PaymentMailDialog/PaymentMailDialogForm.tsx

@@ -58,7 +58,7 @@ export function PaymentMailDialogFormRoot({
 
         // Redirects to payments list if the option is enabled.
         if (redirectToPaymentsList) {
-          history.push('/payment-receives');
+          history.push('/payments-received');
         }
       })
       .catch(() => {

packages/webapp/src/containers/Sales/PaymentsReceived/PaymentReceiveForm/PaymentReceiveForm.schema.tsx

@@ -13,7 +13,7 @@ const Schema = Yup.object().shape({
   payment_receive_no: Yup.string()
     .nullable()
     .max(DATATYPES_LENGTH.STRING)
-    .label(intl.get('payment_receive_no_')),
+    .label(intl.get('payment_received_no_')),
   reference_no: Yup.string().min(1).max(DATATYPES_LENGTH.STRING).nullable(),
   // statement: Yup.string().nullable().max(DATATYPES_LENGTH.TEXT),
   branch_id: Yup.string(),

packages/webapp/src/containers/Sales/PaymentsReceived/PaymentReceiveForm/PaymentReceiveForm.tsx

@@ -1,6 +1,6 @@
 // @ts-nocheck
-import React, { useMemo, useRef } from 'react';
+import React, { useMemo } from 'react';
-import { sumBy, isEmpty, defaultTo } from 'lodash';
+import { isEmpty, defaultTo } from 'lodash';
 import intl from 'react-intl-universal';
 import classNames from 'classnames';
 import { Formik, Form } from 'formik';
@@ -133,14 +133,14 @@ function PaymentReceiveForm({
       AppToaster.show({
         message: intl.get(
           paymentReceiveId
-            ? 'the_payment_receive_transaction_has_been_edited'
+            ? 'the_payment_received_transaction_has_been_edited'
-            : 'the_payment_receive_transaction_has_been_created',
+            : 'the_payment_received_transaction_has_been_created',
         ),
         intent: Intent.SUCCESS,
       });
 
       if (submitPayload.redirect) {
-        history.push('/payment-receives');
+        history.push('/payments-received');
       }
       if (submitPayload.resetForm) {
         resetFormState({ resetForm, initialValues, values });

packages/webapp/src/containers/Sales/PaymentsReceived/PaymentReceiveForm/PaymentReceiveFormAlerts.tsx

@@ -1,7 +1,7 @@
 // @ts-nocheck
 import React from 'react';
 import { useFormikContext } from 'formik';
-import ClearingAllLinesAlert from '@/containers/Alerts/PaymentReceives/ClearingAllLinesAlert';
+import ClearingAllLinesAlert from '@/containers/Alerts/PaymentReceived/ClearingAllLinesAlert';
 import { clearAllPaymentEntries } from './utils';
 
 /**

packages/webapp/src/containers/Sales/PaymentsReceived/PaymentReceiveForm/PaymentReceivePaymentNoField.tsx

@@ -64,7 +64,7 @@ export const PaymentReceivePaymentNoField = R.compose(
     return (
       <FFormGroup
         name={'payment_receive_no'}
-        label={<T id={'payment_receive_no'} />}
+        label={<T id={'payment_received_no'} />}
         inline={true}
         labelInfo={<FieldRequiredHint />}
       >

packages/webapp/src/containers/Sales/PaymentsReceived/PaymentReceiveForm/utils.tsx

@@ -204,7 +204,7 @@ export const transformErrors = (errors, { setFieldError }) => {
   if (getError('PAYMENT_RECEIVE_NO_REQUIRED')) {
     setFieldError(
       'payment_receive_no',
-      intl.get('payment_receive.field.error.payment_receive_no_required'),
+      intl.get('payment_received.field.error.payment_receive_no_required'),
     );
   }
   if (getError('PAYMENT_ACCOUNT_CURRENCY_INVALID')) {

packages/webapp/src/containers/Sales/PaymentsReceived/PaymentReceiveUniversalSearch.tsx

@@ -8,9 +8,9 @@ import {
   AbilitySubject,
   PaymentReceiveAction,
 } from '@/constants/abilityOption';
+import withDrawerActions from '@/containers/Drawer/withDrawerActions';
 import { highlightText } from '@/utils';
 import { Icon } from '@/components';
-import withDrawerActions from '@/containers/Drawer/withDrawerActions';
 import { DRAWERS } from '@/constants/drawers';
 
 /**
@@ -25,7 +25,7 @@ function PaymentReceiveUniversalSearchSelectComponent({
   openDrawer,
 }) {
   if (resourceType === RESOURCES_TYPES.PAYMENT_RECEIVE) {
-    openDrawer(DRAWERS.PAYMENT_RECEIVE_DETAILS, {
+    openDrawer(DRAWERS.PAYMENT_RECEIVED_DETAILS, {
       paymentReceiveId: resourceId,
     });
   }
@@ -80,7 +80,7 @@ const paymentReceivesToSearch = (payment) => ({
  */
 export const universalSearchPaymentReceiveBind = () => ({
   resourceType: RESOURCES_TYPES.PAYMENT_RECEIVE,
-  optionItemLabel: intl.get('payment_receives'),
+  optionItemLabel: intl.get('payment_received'),
   selectItemAction: PaymentReceiveUniversalSearchSelect,
   itemRenderer: PaymentReceiveUniversalSearchItem,
   itemSelect: paymentReceivesToSearch,

packages/webapp/src/containers/Sales/PaymentsReceived/PaymentsLanding/PaymentReceivesListProvider.tsx

@@ -10,12 +10,12 @@ import {
 } from '@/hooks/query';
 import { getFieldsFromResourceMeta } from '@/utils';
 
-const PaymentReceivesListContext = createContext();
+const PaymentsReceivedListContext = createContext();
 
 /**
  * Payment receives data provider.
  */
-function PaymentReceivesListProvider({ query, tableStateChanged, ...props }) {
+function PaymentsReceivedListProvider({ query, tableStateChanged, ...props }) {
   // Fetch accounts resource views and fields.
   const { data: paymentReceivesViews, isFetching: isViewsLoading } =
     useResourceViews('payment_receives');
@@ -60,12 +60,12 @@ function PaymentReceivesListProvider({ query, tableStateChanged, ...props }) {
       loading={isViewsLoading || isResourceLoading}
       name={'payment_receives'}
     >
-      <PaymentReceivesListContext.Provider value={provider} {...props} />
+      <PaymentsReceivedListContext.Provider value={provider} {...props} />
     </DashboardInsider>
   );
 }
 
-const usePaymentReceivesListContext = () =>
+const usePaymentsReceivedListContext = () =>
-  React.useContext(PaymentReceivesListContext);
+  React.useContext(PaymentsReceivedListContext);
 
-export { PaymentReceivesListProvider, usePaymentReceivesListContext };
+export { PaymentsReceivedListProvider, usePaymentsReceivedListContext };

packages/webapp/src/containers/Sales/PaymentsReceived/PaymentsLanding/PaymentsReceivedActionsBar.tsx

@@ -22,8 +22,8 @@ import {
   DashboardActionsBar,
 } from '@/components';
 
-import withPaymentReceives from './withPaymentReceives';
+import withPaymentsReceived from './withPaymentsReceived';
-import withPaymentReceivesActions from './withPaymentReceivesActions';
+import withPaymentsReceivedActions from './withPaymentsReceivedActions';
 import withSettings from '@/containers/Settings/withSettings';
 import withSettingsActions from '@/containers/Settings/withSettingsActions';
 import withDialogActions from '@/containers/Dialog/withDialogActions';
@@ -32,7 +32,7 @@ import {
   AbilitySubject,
 } from '@/constants/abilityOption';
 
-import { usePaymentReceivesListContext } from './PaymentReceiptsListProvider';
+import { usePaymentsReceivedListContext } from './PaymentsReceivedListProvider';
 import { useRefreshPaymentReceive } from '@/hooks/query/paymentReceives';
 import { useDownloadExportPdf } from '@/hooks/query/FinancialReports/use-export-pdf';
 
@@ -42,11 +42,11 @@ import { DialogsName } from '@/constants/dialogs';
 /**
  * Payment receives actions bar.
  */
-function PaymentReceiveActionsBar({
+function PaymentsReceivedActionsBar({
-  // #withPaymentReceivesActions
+  // #withPaymentsReceivedActions
   setPaymentReceivesTableState,
 
-  // #withPaymentReceives
+  // #withPaymentsReceived
   paymentFilterConditions,
 
   // #withSettings
@@ -62,14 +62,14 @@ function PaymentReceiveActionsBar({
   const history = useHistory();
 
   // Payment receives list context.
-  const { paymentReceivesViews, fields } = usePaymentReceivesListContext();
+  const { paymentReceivesViews, fields } = usePaymentsReceivedListContext();
 
   // Exports pdf document.
   const { downloadAsync: downloadExportPdf } = useDownloadExportPdf();
 
   // Handle new payment button click.
   const handleClickNewPaymentReceive = () => {
-    history.push('/payment-receives/new');
+    history.push('/payment-received/new');
   };
 
   // Payment receive refresh action.
@@ -91,7 +91,7 @@ function PaymentReceiveActionsBar({
   };
   // Handle the import button click.
   const handleImportBtnClick = () => {
-    history.push('/payment-receives/import');
+    history.push('/payments-received/import');
   };
   // Handle the export button click.
   const handleExportBtnClick = () => {
@@ -115,7 +115,7 @@ function PaymentReceiveActionsBar({
           <Button
             className={Classes.MINIMAL}
             icon={<Icon icon={'plus'} />}
-            text={<T id={'new_payment_receive'} />}
+            text={<T id={'new_payment_received'} />}
             onClick={handleClickNewPaymentReceive}
           />
         </Can>
@@ -181,9 +181,9 @@ function PaymentReceiveActionsBar({
 }
 
 export default compose(
-  withPaymentReceivesActions,
+  withPaymentsReceivedActions,
   withSettingsActions,
-  withPaymentReceives(({ paymentReceivesTableState }) => ({
+  withPaymentsReceived(({ paymentReceivesTableState }) => ({
     paymentReceivesTableState,
     paymentFilterConditions: paymentReceivesTableState.filterRoles,
   })),
@@ -191,4 +191,4 @@ export default compose(
     paymentReceivesTableSize: paymentReceiveSettings?.tableSize,
   })),
   withDialogActions,
-)(PaymentReceiveActionsBar);
+)(PaymentsReceivedActionsBar);

packages/webapp/src/containers/Sales/PaymentsReceived/PaymentsLanding/PaymentsReceivedEmptyStatus.tsx

@@ -6,7 +6,7 @@ import { EmptyStatus } from '@/components';
 import { Can, FormattedMessage as T } from '@/components';
 import { PaymentReceiveAction, AbilitySubject } from '@/constants/abilityOption';
 
-export default function PaymentReceivesEmptyStatus() {
+export default function PaymentsReceivedEmptyStatus() {
   const history = useHistory();
 
   return (
@@ -29,10 +29,10 @@ export default function PaymentReceivesEmptyStatus() {
               intent={Intent.PRIMARY}
               large={true}
               onClick={() => {
-                history.push('/payment-receives/new');
+                history.push('/payment-received/new');
               }}
             >
-              <T id={'new_payment_receive'} />
+              <T id={'new_payment_received'} />
             </Button>
 
             <Button intent={Intent.NONE} large={true}>

packages/webapp/src/containers/Sales/PaymentsReceived/PaymentsLanding/PaymentsReceivedList.tsx

@@ -4,24 +4,21 @@ import React from 'react';
 import '@/style/pages/PaymentReceive/List.scss';
 
 import { DashboardPageContent } from '@/components';
-import { PaymentReceivesListProvider } from './PaymentReceiptsListProvider';
+import { PaymentsReceivedListProvider } from './PaymentsReceivedListProvider';
-import PaymentReceivesTable from './PaymentReceivesTable';
+import PaymentReceivesTable from './PaymentsReceivedTable';
-import PaymentReceiveActionsBar from './PaymentReceiveActionsBar';
+import PaymentsReceivedActionsBar from './PaymentsReceivedActionsBar';
 
-import withPaymentReceives from './withPaymentReceives';
+import withPaymentsReceived from './withPaymentsReceived';
-import withPaymentReceivesActions from './withPaymentReceivesActions';
+import withPaymentsReceivedActions from './withPaymentsReceivedActions';
 
 import { compose, transformTableStateToQuery } from '@/utils';
 
-/**
+function PaymentsReceivedList({
- * Payment receives list.
+  // #withPaymentsReceived
- */
-function PaymentReceiveList({
-  // #withPaymentReceives
   paymentReceivesTableState,
   paymentsTableStateChanged,
 
-  // #withPaymentReceivesActions
+  // #withPaymentsReceivedActions
   resetPaymentReceivesTableState,
 }) {
   // Resets the payment receives table state once the page unmount.
@@ -33,25 +30,25 @@ function PaymentReceiveList({
   );
 
   return (
-    <PaymentReceivesListProvider
+    <PaymentsReceivedListProvider
       query={transformTableStateToQuery(paymentReceivesTableState)}
       tableStateChanged={paymentsTableStateChanged}
     >
-      <PaymentReceiveActionsBar />
+      <PaymentsReceivedActionsBar />
 
       <DashboardPageContent>
         <PaymentReceivesTable />
       </DashboardPageContent>
-    </PaymentReceivesListProvider>
+    </PaymentsReceivedListProvider>
   );
 }
 
 export default compose(
-  withPaymentReceives(
+  withPaymentsReceived(
     ({ paymentReceivesTableState, paymentsTableStateChanged }) => ({
       paymentReceivesTableState,
       paymentsTableStateChanged,
     }),
   ),
-  withPaymentReceivesActions,
+  withPaymentsReceivedActions,
-)(PaymentReceiveList);
+)(PaymentsReceivedList);

packages/webapp/src/containers/Sales/PaymentsReceived/PaymentsLanding/PaymentsReceivedListProvider.tsx

@@ -10,12 +10,12 @@ import {
 } from '@/hooks/query';
 import { getFieldsFromResourceMeta } from '@/utils';
 
-const PaymentReceivesListContext = createContext();
+const PaymentsReceivedListContext = createContext();
 
 /**
  * Payment receives list data provider.
  */
-function PaymentReceivesListProvider({ query, tableStateChanged, ...props }) {
+function PaymentsReceivedListProvider({ query, tableStateChanged, ...props }) {
   // Fetch payment receives resource views and fields.
   const { data: paymentReceivesViews, isLoading: isViewsLoading } =
     useResourceViews('payment_receives');
@@ -61,12 +61,12 @@ function PaymentReceivesListProvider({ query, tableStateChanged, ...props }) {
       loading={isViewsLoading || isResourceLoading}
       name={'payment-receives-list'}
     >
-      <PaymentReceivesListContext.Provider value={state} {...props} />
+      <PaymentsReceivedListContext.Provider value={state} {...props} />
     </DashboardInsider>
   );
 }
 
-const usePaymentReceivesListContext = () =>
+const usePaymentsReceivedListContext = () =>
-  useContext(PaymentReceivesListContext);
+  useContext(PaymentsReceivedListContext);
 
-export { PaymentReceivesListProvider, usePaymentReceivesListContext };
+export { PaymentsReceivedListProvider, usePaymentsReceivedListContext };

packages/webapp/src/containers/Sales/PaymentsReceived/PaymentsLanding/PaymentsReceivedTable.tsx

@@ -11,17 +11,17 @@ import {
   TableSkeletonHeader,
 } from '@/components';
 
-import PaymentReceivesEmptyStatus from './PaymentReceivesEmptyStatus';
+import PaymentReceivesEmptyStatus from './PaymentsReceivedEmptyStatus';
 
-import withPaymentReceives from './withPaymentReceives';
+import withPaymentsReceived from './withPaymentsReceived';
-import withPaymentReceivesActions from './withPaymentReceivesActions';
+import withPaymentsReceivedActions from './withPaymentsReceivedActions';
 import withAlertsActions from '@/containers/Alert/withAlertActions';
 import withDrawerActions from '@/containers/Drawer/withDrawerActions';
 import withDialogActions from '@/containers/Dialog/withDialogActions';
 import withSettings from '@/containers/Settings/withSettings';
 
 import { usePaymentReceivesColumns, ActionsMenu } from './components';
-import { usePaymentReceivesListContext } from './PaymentReceiptsListProvider';
+import { usePaymentsReceivedListContext } from './PaymentsReceivedListProvider';
 import { useMemorizedColumnsWidths } from '@/hooks';
 import { DRAWERS } from '@/constants/drawers';
 import { DialogsName } from '@/constants/dialogs';
@@ -29,8 +29,8 @@ import { DialogsName } from '@/constants/dialogs';
 /**
  * Payment receives datatable.
  */
-function PaymentReceivesDataTable({
+function PaymentsReceivedDataTable({
-  // #withPaymentReceivesActions
+  // #withPaymentsReceivedActions
   setPaymentReceivesTableState,
 
   // #withAlertsActions
@@ -55,24 +55,24 @@ function PaymentReceivesDataTable({
     isPaymentReceivesLoading,
     isPaymentReceivesFetching,
     isEmptyStatus,
-  } = usePaymentReceivesListContext();
+  } = usePaymentsReceivedListContext();
 
   // Payment receives columns.
   const columns = usePaymentReceivesColumns();
 
   // Handles edit payment receive.
   const handleEditPaymentReceive = ({ id }) => {
-    history.push(`/payment-receives/${id}/edit`);
+    history.push(`/payments-received/${id}/edit`);
   };
 
   // Handles delete payment receive.
   const handleDeletePaymentReceive = ({ id }) => {
-    openAlert('payment-receive-delete', { paymentReceiveId: id });
+    openAlert('payment-received-delete', { paymentReceiveId: id });
   };
 
   // Handle view detail  payment receive..
   const handleViewDetailPaymentReceive = ({ id }) => {
-    openDrawer(DRAWERS.PAYMENT_RECEIVE_DETAILS, { paymentReceiveId: id });
+    openDrawer(DRAWERS.PAYMENT_RECEIVED_DETAILS, { paymentReceiveId: id });
   };
 
   // Handle mail send payment receive.
@@ -82,7 +82,7 @@ function PaymentReceivesDataTable({
 
   // Handle cell click.
   const handleCellClick = (cell, event) => {
-    openDrawer(DRAWERS.PAYMENT_RECEIVE_DETAILS, {
+    openDrawer(DRAWERS.PAYMENT_RECEIVED_DETAILS, {
       paymentReceiveId: cell.row.original.id,
     });
   };
@@ -144,14 +144,14 @@ function PaymentReceivesDataTable({
 }
 
 export default compose(
-  withPaymentReceivesActions,
+  withPaymentsReceivedActions,
   withAlertsActions,
   withDrawerActions,
   withDialogActions,
-  withPaymentReceives(({ paymentReceivesTableState }) => ({
+  withPaymentsReceived(({ paymentReceivesTableState }) => ({
     paymentReceivesTableState,
   })),
   withSettings(({ paymentReceiveSettings }) => ({
     paymentReceivesTableSize: paymentReceiveSettings?.tableSize,
   })),
-)(PaymentReceivesDataTable);
+)(PaymentsReceivedDataTable);

packages/webapp/src/containers/Sales/PaymentsReceived/PaymentsLanding/PaymentsReceivedViewTabs.tsx

@@ -5,24 +5,24 @@ import { Alignment, Navbar, NavbarGroup } from '@blueprintjs/core';
 import { FormattedMessage as T, DashboardViewsTabs } from '@/components';
 import { pick } from 'lodash';
 
-import withPaymentReceives from './withPaymentReceives';
+import withPaymentsReceived from './withPaymentsReceived';
-import withPaymentReceivesActions from './withPaymentReceivesActions';
+import withPaymentsReceivedActions from './withPaymentsReceivedActions';
-import { usePaymentReceivesListContext } from './PaymentReceiptsListProvider';
+import { usePaymentsReceivedListContext } from './PaymentsReceivedListProvider';
 
 import { compose } from '@/utils';
 
 /**
  * Payment receive view tabs.
  */
-function PaymentReceiveViewTabs({
+function PaymentsReceivedViewTabs({
-  // #withPaymentReceivesActions
+  // #withPaymentsReceivedActions
   addPaymentReceivesTableQueries,
 
-  // #withPaymentReceives
+  // #withPaymentsReceived
   paymentReceivesTableState,
 }) {
   const history = useHistory();
-  const { paymentReceivesViews, ...res } = usePaymentReceivesListContext();
+  const { paymentReceivesViews, ...res } = usePaymentsReceivedListContext();
 
   const tabs = paymentReceivesViews.map((view) => ({
     ...pick(view, ['name', 'id']),
@@ -30,7 +30,7 @@ function PaymentReceiveViewTabs({
 
   // Handles click a new view tab.
   const handleClickNewView = () => {
-    history.push('/custom_views/payment-receives/new');
+    history.push('/custom_views/payment-received/new');
   };
 
   // Handles the active tab chaing.
@@ -56,8 +56,8 @@ function PaymentReceiveViewTabs({
 }
 
 export default compose(
-  withPaymentReceivesActions,
+  withPaymentsReceivedActions,
-  withPaymentReceives(({ paymentReceivesTableState }) => ({
+  withPaymentsReceived(({ paymentReceivesTableState }) => ({
     paymentReceivesTableState,
   })),
-)(PaymentReceiveViewTabs);
+)(PaymentsReceivedViewTabs);

packages/webapp/src/containers/Sales/PaymentsReceived/PaymentsLanding/components.tsx

@@ -12,7 +12,7 @@ import {
   Position,
 } from '@blueprintjs/core';
 
-import { FormatDateCell, Money, Icon, Can } from '@/components';
+import { Money, Icon, Can } from '@/components';
 import { safeCallback } from '@/utils';
 import { CLASSES } from '@/constants/classes';
 import {
@@ -43,14 +43,14 @@ export function ActionsMenu({
         <MenuDivider />
         <MenuItem
           icon={<Icon icon="pen-18" />}
-          text={intl.get('edit_payment_receive')}
+          text={intl.get('edit_payment_received')}
           onClick={safeCallback(onEdit, paymentReceive)}
         />
       </Can>
       <Can I={PaymentReceiveAction.Delete} a={AbilitySubject.PaymentReceive}>
         <MenuDivider />
         <MenuItem
-          text={intl.get('delete_payment_receive')}
+          text={intl.get('delete_payment_received')}
           intent={Intent.DANGER}
           onClick={safeCallback(onDelete, paymentReceive)}
           icon={<Icon icon="trash-16" iconSize={16} />}
@@ -117,7 +117,7 @@ export function usePaymentReceivesColumns() {
       },
       {
         id: 'payment_receive_no',
-        Header: intl.get('payment_receive_no'),
+        Header: intl.get('payment_received_no'),
         accessor: (row) =>
           row.payment_receive_no ? `${row.payment_receive_no}` : null,
         width: 140,

packages/webapp/src/containers/Sales/PaymentsReceived/PaymentsReceivedAlerts.tsx

@@ -0,0 +1,13 @@
+// @ts-nocheck
+import React from 'react';
+
+const PaymentReceivedDeleteAlert = React.lazy(
+  () => import('@/containers/Alerts/PaymentReceived/PaymentReceivedDeleteAlert'),
+);
+
+/**
+ * PaymentReceives alert.
+ */
+export default [
+  { name: 'payment-received-delete', component: PaymentReceivedDeleteAlert },
+];

packages/webapp/src/containers/Sales/PaymentsReceived/PaymentsReceivedImport.tsx

@@ -7,10 +7,10 @@ export default function PaymentsReceiveImport() {
   const history = useHistory();
 
   const handleCancelBtnClick = () => {
-    history.push('/payment-receives');
+    history.push('/payments-received');
   };
   const handleImportSuccess = () => {
-    history.push('/payment-receives');
+    history.push('/payments-received');
   };
 
   return (

packages/webapp/src/containers/UniversalSearch/DashboardUniversalSearchBinds.tsx

@@ -3,7 +3,7 @@ import { universalSearchInvoiceBind } from '../Sales/Invoices/InvoiceUniversalSe
 import { universalSearchReceiptBind } from '../Sales/Receipts/ReceiptUniversalSearch';
 import { universalSearchBillBind } from '../Purchases/Bills/BillUniversalSearch';
 import { universalSearchEstimateBind } from '../Sales/Estimates/EstimatesLanding/EstimateUniversalSearch';
-import { universalSearchPaymentReceiveBind } from '../Sales/PaymentReceives/PaymentReceiveUniversalSearch';
+import { universalSearchPaymentReceiveBind } from '../Sales/PaymentsReceived/PaymentReceiveUniversalSearch';
 import { universalSearchPaymentMadeBind } from '../Purchases/PaymentMades/PaymentMadeUniversalSearch';
 import { universalSearchItemBind } from '../Items/ItemsUniversalSearch';
 import { universalSearchCustomerBind } from '../Customers/CustomersUniversalSearch';

packages/webapp/src/lang/ar/index.json

@@ -572,9 +572,9 @@
   "the_bill_has_been_deleted_successfully": "تم حذف الفاتورة بنجاح.",
   "once_delete_this_bill_you_will_able_to_restore_it": "بمجرد حذف هذه الفاتورة ، لن تتمكن من استعادتها لاحقًا. هل أنت متأكد أنك تريد حذف هذه الفاتورة؟",
   "deposit_to": "الإيداع",
-  "edit_payment_receive": "تعديل سند الزبون",
+  "edit_payment_received": "تعديل سند الزبون",
-  "delete_payment_receive": "حذف سند الزبون",
+  "delete_payment_received": "حذف سند الزبون",
-  "payment_receives_list": "سندات الزبائن",
+  "payments_received_list": "سندات الزبائن",
   "payment_receive": "سند الزبون",
   "new_payment_receive": "سند زبون جديد",
   "payment_receives": "سندات الزبائن",
@@ -582,10 +582,10 @@
   "payment_receive_no_": "رقم سند الدفع",
   "receive_amount": "استلام المبلغ",
   "receive_amount_": "استلام المبلغ",
-  "the_payment_receive_transaction_has_been_created": "تم إنشاء سند الزبون بنجاح.",
+  "the_payment_received_transaction_has_been_created": "تم إنشاء سند الزبون بنجاح.",
-  "the_payment_receive_has_been_deleted_successfully": "تم حذف سند الزبون بنجاح.",
+  "the_payment_received_has_been_deleted_successfully": "تم حذف سند الزبون بنجاح.",
-  "the_payment_receive_transaction_has_been_edited": "تم تعديل معاملة سند الزبون بنجاح.",
+  "the_payment_received_transaction_has_been_edited": "تم تعديل معاملة سند الزبون بنجاح.",
-  "once_delete_this_payment_receive_you_will_able_to_restore_it": "بمجرد حذف هذا السند ، لن تتمكن من استعادتها لاحقًا. هل أنت متأكد أنك تريد حذف هذه المعاملة؟",
+  "once_delete_this_payment_received_you_will_able_to_restore_it": "بمجرد حذف هذا السند ، لن تتمكن من استعادتها لاحقًا. هل أنت متأكد أنك تريد حذف هذه المعاملة؟",
   "select_invoice": "حدد الفاتورة",
   "payment_mades": "سندات الموردين",
   "subscription": "الاشتراك",
@@ -842,7 +842,7 @@
   "add_payment": "إضافة دفع",
   "quick_receive_payment": "سند قبض سريع",
   "amount_received": "تم استلام المبلغ",
-  "payment_receive_number_required": "مطلوب رقم استلام الدفعة",
+  "payment_received_number_required": "مطلوب رقم استلام الدفعة",
   "quick_made_payment": "سند دفع سريع",
   "the_payment_amount_bigger_than_invoice_due_amount": "مبلغ الدفعة أكبر من مبلغ الفاتورة المستحق.",
   "accounting_basis_": "الأساس المحاسبي",
@@ -931,7 +931,7 @@
   "the_organization_doesn_t_receive_money_yet": "المنشأة لم تستلم اي اموال من الزبائن ، إلي حد الأن!.",
   "there_is_no_receivable_invoices_for_this_customer": "لا توجد فواتير مستحقة لهذا الزبون يمكن عرضها لتسديدها.",
   "please_select_a_customer_to_display_all_open_invoices_for_it": "يرجى تحديد الزبون لعرض جميع الفواتير المفتوحة له.",
-  "payment_receive_details": "تفاصيل سند الزبون",
+  "payment_received_details": "تفاصيل سند الزبون",
   "receive_full_amount": "استلام المبلغ كاملاً",
   "manage_the_organization_s_services_and_products": "إدارة الخدمات والمنتجات للمنشأة.",
   "here_a_list_of_your_organization_products_and_services": "هنا قائمة بمنتجات وخدمات عملك ، لاستخدامها عند إنشاء فواتير أو فواتير لموردين أو البائعين.",
@@ -1356,7 +1356,7 @@
   },
   "estimate.field.error.estimate_number_required": "رقم العرض حقل مطلوب ، استخدم وضع الزيادة التلقائي أو أدخل يدويًا.",
   "invoice.field.error.invoice_no_required": "رقم الفاتورة حقل مطلوب ، استخدم وضع الزيادة التلقائي أو أدخل يدويًا.",
-  "payment_receive.field.error.payment_receive_no_required": "رقم سند الدفع حقل مطلوب ، استخدم وضع الزيادة التلقائي أو أدخل يدويًا.",
+  "payment_received.field.error.payment_receive_no_required": "رقم سند الدفع حقل مطلوب ، استخدم وضع الزيادة التلقائي أو أدخل يدويًا.",
   "receipt.field.error.receipt_number_required": "رقم الإيصال حقل مطلوب ، استخدم وضع الزيادة التلقائي أو أدخل يدويًا.",
   "dashboard.rows_height": "ارتفاع الصفوف",
   "dashboard.row_small": "صغير",
@@ -1740,7 +1740,7 @@
   "estimate.drawer.title": "تفاصيل العرض ({number})",
   "receipt.drawer.title": "تفاصيل الإيصال ({number})",
   "credit_note.drawer.title": "تفاصيل إشعار الدائن ({number})",
-  "payment_receive.drawer.title": "تفاصيل سند الزبون ({number})",
+  "payment_received.drawer.title": "تفاصيل سند الزبون ({number})",
   "payment_made.drawer.title": "تفاصيل سند المورد {number}",
   "manual_journal.drawer.title": "تفاصيل قيد يدوي ({number})",
   "expense.drawer.title": " تفاصيل المصروف",
@@ -1756,7 +1756,7 @@
   "customer.alert.inactivated_message": "تم إلغاء تنشيط الزبون بنجاح.",
   "customer.alert.are_you_sure_want_to_inactivate_this_customer": "هل أنت متأكد أنك تريد إلغاء تنشيط هذا الزبون؟ ستكون قادرًا على تنشيطه لاحقًا",
   "credit_note_preview.dialog.title": "معاينة إشعار الدائن PDF",
-  "payment_receive_preview.dialog.title": "معاينة سند الزبون PDF",
+  "payment_received_preview.dialog.title": "معاينة سند الزبون PDF",
   "balance_sheet.comparisons": "مقارنات",
   "balance_sheet.dimensions": "الابعاد",
   "balance_sheet.percentage_of_column": "% التغير العمودي",

packages/webapp/src/lang/en/index.json

@@ -571,20 +571,20 @@
   "the_bill_has_been_deleted_successfully": "The bill has been deleted successfully.",
   "once_delete_this_bill_you_will_able_to_restore_it": "Once you delete this bill, you won't be able to restore it later. Are you sure you want to delete this bill?",
   "deposit_to": "Deposit to",
-  "edit_payment_receive": "Edit Payment Receive",
+  "edit_payment_received": "Edit Payment Received",
-  "delete_payment_receive": "Delete Payment Receive",
+  "delete_payment_received": "Delete Payment Received",
-  "payment_receives_list": "Payment Receives List",
+  "payments_received_list": "Payments Received List",
-  "payment_receive": "Payment Receive",
+  "payment_receive": "Payment Received",
-  "new_payment_receive": "New Payment Receive",
+  "new_payment_received": "New Payment Received",
-  "payment_receives": "Payment Receives",
+  "payment_received": "Payment Received",
-  "payment_receive_no": "Payment Receive #",
+  "payment_received_no": "Payment Received #",
-  "payment_receive_no_": "Payment receive no",
+  "payment_received_no_": "Payment received no",
   "receive_amount": "Receive Amount",
   "receive_amount_": "Receive amount",
-  "the_payment_receive_transaction_has_been_created": "The payment receive transaction has been created successfully.",
+  "the_payment_received_transaction_has_been_created": "The payment received transaction has been created successfully.",
-  "the_payment_receive_has_been_deleted_successfully": "The payment receive has been deleted successfully.",
+  "the_payment_received_has_been_deleted_successfully": "The payment received has been deleted successfully.",
-  "the_payment_receive_transaction_has_been_edited": "The payment receive transaction has been edited successfully.",
+  "the_payment_received_transaction_has_been_edited": "The payment received transaction has been edited successfully.",
-  "once_delete_this_payment_receive_you_will_able_to_restore_it": "Once you delete this payment receive, you won't be able to restore it later. Are you sure you want to delete this payment receive?",
+  "once_delete_this_payment_received_you_will_able_to_restore_it": "Once you delete this payment received, you won't be able to restore it later. Are you sure you want to delete this payment transaction?",
   "select_invoice": "Select Invoice",
   "payment_mades": "Payment Mades",
   "subscription": "Subscription",
@@ -840,7 +840,7 @@
   "quick_receive_payment": "Quick Receive Payment",
   "amount_received": "Amount Received",
   "payment_no": "Payment No.",
-  "payment_receive_number_required": "Payment receive number required",
+  "payment_received_number_required": "Payment received number required",
   "quick_made_payment": "Quick Made Payment",
   "the_payment_amount_bigger_than_invoice_due_amount": "The payment amount bigger than invoice due amount.",
   "accounting_basis_": "Accounting Basis",
@@ -931,7 +931,7 @@
   "the_organization_doesn_t_receive_money_yet": "The organization doesn't receive money, yet!",
   "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",
+  "payment_received_details": "Payment Received Details",
   "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.",
@@ -1342,7 +1342,7 @@
   },
   "estimate.field.error.estimate_number_required": "Estimate number is required, use auto-increment mode or enter manually.",
   "invoice.field.error.invoice_no_required": "Invoice number is required, use auto-increment mode or enter manually",
-  "payment_receive.field.error.payment_receive_no_required": "Payment receive number is required, use auto-increment mode or enter manually",
+  "payment_received.field.error.payment_receive_no_required": "Payment received number is required, use auto-increment mode or enter manually",
   "receipt.field.error.receipt_number_required": "Receipt number is required, use auto-increment mode or enter manually",
   "dashboard.rows_height": "Rows height",
   "dashboard.row_small": "Small",
@@ -1474,7 +1474,7 @@
   "sms_notification.invoice_details.type": "Invoice details",
   "sms_notification.invoice_reminder.type": "Invoice reminder",
   "sms_notification.estimate_details.type": "Sale estimate details",
-  "sms_notification.payment_details.type": "Payment receive thank you.",
+  "sms_notification.payment_details.type": "Payment received thank you.",
   "sms_notification.receipt_details.type": "Sale receipt details",
   "personal": "Personal",
   "list.create": "Create {value}",
@@ -1739,8 +1739,8 @@
   "receipt.drawer.subtitle": "Branch: {value}",
   "credit_note.drawer.title": "Credit Note details ({number})",
   "credit_note.drawer.subtitle": "Branch: {value}",
-  "payment_receive.drawer.title": "Payment receive details ({number})",
+  "payment_received.drawer.title": "Payment Received Details ({number})",
-  "payment_receive.drawer.subtitle": "Branch: {value}",
+  "payment_received.drawer.subtitle": "Branch: {value}",
   "payment_made.drawer.title": "Payment made details {number}",
   "payment_made.drawer.subtitle": "Branch: {value}",
   "manual_journal.drawer.title": "Manual journal details ({number})",
@@ -1782,7 +1782,7 @@
   "customer.alert.inactivated_message": "The customer has been inactivated successfully.",
   "customer.alert.are_you_sure_want_to_inactivate_this_customer": "Are you sure want to inactivate this customer? You will to able to activate it later.",
   "credit_note_preview.dialog.title": "Credit Note PDF Preview",
-  "payment_receive_preview.dialog.title": "Payment Receive PDF Preview",
+  "payment_received_preview.dialog.title": "Payment Received PDF Preview",
   "warehouses.label": "Warehouses",
   "warehouses.label.new_warehouse": "New Warehouse",
   "warehouse.dialog.label.new_warehouse": "New Warehouse",
@@ -2193,7 +2193,7 @@
   "sidebar.invoices": "Invoices",
   "sidebar.receipts": "Receipts",
   "sidebar.credit_notes": "Credit Notes",
-  "sidebar.payment_receives": "Payment Receives",
+  "sidebar.payments_received": "Payments Received",
   "sidebar.purchases": "Purchases",
   "sidebar.bills": "Bills",
   "sidebar.vendor_credits": "Vendor Credits",
@@ -2210,7 +2210,7 @@
   "sidebar.new_invoice": "New Invoice",
   "sidebar.new_estimate": "New Estimate",
   "sidebar.new_credit_note": "New Credit Note",
-  "sidebar.new_payment_receive": "New Payment Receive",
+  "sidebar.new_payment_received": "New Payment Received",
   "sidebar.accounting": "Accounting",
   "sidebar.financial": "Financial",
   "sidebar.accounts_chart": "Accounts Chart",

packages/webapp/src/routes/dashboard.tsx

@@ -912,59 +912,59 @@ export const getDashboardRoutes = () => [
   },
   // Payment receives
   {
-    path: `/payment-receives/import`,
+    path: `/payments-received/import`,
     component: lazy(
-      () => import('@/containers/Sales/PaymentReceives/PaymentReceivesImport'),
+      () => import('@/containers/Sales/PaymentsReceived/PaymentsReceivedImport'),
     ),
     name: 'payment-receive-import',
-    breadcrumb: 'Payments Receive Import',
+    breadcrumb: 'Payments Received Import',
-    pageTitle: 'Payments Receive Import',
+    pageTitle: 'Payments Received Import',
     backLink: true,
     defaultSearchResource: RESOURCES_TYPES.PAYMENT_RECEIVE,
     subscriptionActive: [SUBSCRIPTION_TYPE.MAIN],
   },
   {
-    path: `/payment-receives/:id/edit`,
+    path: `/payments-received/:id/edit`,
     component: lazy(
       () =>
         import(
-          '@/containers/Sales/PaymentReceives/PaymentReceiveForm/PaymentReceiveFormPage'
+          '@/containers/Sales/PaymentsReceived/PaymentReceiveForm/PaymentReceiveFormPage'
         ),
     ),
     name: 'payment-receive-edit',
     breadcrumb: intl.get('edit'),
-    pageTitle: intl.get('edit_payment_receive'),
+    pageTitle: intl.get('edit_payment_received'),
     backLink: true,
     sidebarExpand: false,
     defaultSearchResource: RESOURCES_TYPES.PAYMENT_RECEIVE,
     subscriptionActive: [SUBSCRIPTION_TYPE.MAIN],
   },
   {
-    path: `/payment-receives/new`,
+    path: `/payment-received/new`,
     component: lazy(
       () =>
         import(
-          '@/containers/Sales/PaymentReceives/PaymentReceiveForm/PaymentReceiveFormPage'
+          '@/containers/Sales/PaymentsReceived/PaymentReceiveForm/PaymentReceiveFormPage'
         ),
     ),
     name: 'payment-receive-new',
-    breadcrumb: intl.get('new_payment_receive'),
+    breadcrumb: intl.get('new_payment_received'),
-    pageTitle: intl.get('new_payment_receive'),
+    pageTitle: intl.get('new_payment_received'),
     backLink: true,
     sidebarExpand: false,
     defaultSearchResource: RESOURCES_TYPES.PAYMENT_RECEIVE,
     subscriptionActive: [SUBSCRIPTION_TYPE.MAIN],
   },
   {
-    path: `/payment-receives`,
+    path: `/payments-received`,
     component: lazy(
       () =>
         import(
-          '@/containers/Sales/PaymentReceives/PaymentsLanding/PaymentReceivesList'
+          '@/containers/Sales/PaymentsReceived/PaymentsLanding/PaymentsReceivedList'
         ),
     ),
-    breadcrumb: intl.get('payment_receives_list'),
+    breadcrumb: intl.get('payments_received_list'),
-    pageTitle: intl.get('payment_receives_list'),
+    pageTitle: intl.get('payments_received_list'),
     defaultSearchResource: RESOURCES_TYPES.PAYMENT_RECEIVE,
     subscriptionActive: [SUBSCRIPTION_TYPE.MAIN],
   },