diff --git a/packages/webapp/src/constants/homepageOptions.tsx b/packages/webapp/src/constants/homepageOptions.tsx index 7c050787d..06688802c 100644 --- a/packages/webapp/src/constants/homepageOptions.tsx +++ b/packages/webapp/src/constants/homepageOptions.tsx @@ -88,7 +88,7 @@ export const accountsPayable = [ { title: , description: , - link: '/payment-mades', + link: '/payments-made', subject: AbilitySubject.PaymentMade, ability: PaymentMadeAction.View, }, diff --git a/packages/webapp/src/constants/sidebarMenu.tsx b/packages/webapp/src/constants/sidebarMenu.tsx index 260a23def..00c4324bd 100644 --- a/packages/webapp/src/constants/sidebarMenu.tsx +++ b/packages/webapp/src/constants/sidebarMenu.tsx @@ -265,8 +265,8 @@ export const SidebarMenu = [ type: ISidebarMenuItemType.Link, }, { - text: , - href: '/payment-mades', + text: , + href: '/payments-made', type: ISidebarMenuItemType.Link, permission: { subject: AbilitySubject.PaymentMade, @@ -299,7 +299,7 @@ export const SidebarMenu = [ }, { text: , - href: '/payment-mades/new', + href: '/payments-made/new', type: ISidebarMenuItemType.Link, permission: { subject: AbilitySubject.PaymentMade, diff --git a/packages/webapp/src/containers/AlertsContainer/registered.tsx b/packages/webapp/src/containers/AlertsContainer/registered.tsx index f585c398f..3d96227c7 100644 --- a/packages/webapp/src/containers/AlertsContainer/registered.tsx +++ b/packages/webapp/src/containers/AlertsContainer/registered.tsx @@ -8,7 +8,7 @@ import InvoicesAlerts from '@/containers/Sales/Invoices/InvoicesAlerts'; import ReceiptsAlerts from '@/containers/Sales/Receipts/ReceiptsAlerts'; import PaymentReceiveAlerts from '@/containers/Sales/PaymentReceives/PaymentReceiveAlerts'; import BillsAlerts from '@/containers/Purchases/Bills/BillsLanding/BillsAlerts'; -import PaymentMadesAlerts from '@/containers/Purchases/PaymentMades/PaymentMadesAlerts'; +import PaymentsMadeAlerts from '@/containers/Purchases/PaymentsMade/PaymentsMadeAlerts'; import CustomersAlerts from '@/containers/Customers/CustomersAlerts'; import VendorsAlerts from '@/containers/Vendors/VendorsAlerts'; import ManualJournalsAlerts from '@/containers/Accounting/JournalsLanding/ManualJournalsAlerts'; @@ -40,7 +40,7 @@ export default [ ...ReceiptsAlerts, ...PaymentReceiveAlerts, ...BillsAlerts, - ...PaymentMadesAlerts, + ...PaymentsMadeAlerts, ...CustomersAlerts, ...VendorsAlerts, ...ManualJournalsAlerts, diff --git a/packages/webapp/src/containers/Dialogs/QuickPaymentMadeFormDialog/utils.tsx b/packages/webapp/src/containers/Dialogs/QuickPaymentMadeFormDialog/utils.tsx index 03470ff50..23d5b832c 100644 --- a/packages/webapp/src/containers/Dialogs/QuickPaymentMadeFormDialog/utils.tsx +++ b/packages/webapp/src/containers/Dialogs/QuickPaymentMadeFormDialog/utils.tsx @@ -7,7 +7,7 @@ import { useFormikContext } from 'formik'; import { Intent } from '@blueprintjs/core'; import { AppToaster } from '@/components'; import { useQuickPaymentMadeContext } from './QuickPaymentMadeFormProvider'; -import { PAYMENT_MADE_ERRORS } from '@/containers/Purchases/PaymentMades/constants'; +import { PAYMENT_MADE_ERRORS } from '@/containers/Purchases/PaymentsMade/constants'; // Default initial values of payment made. export const defaultPaymentMade = { diff --git a/packages/webapp/src/containers/Drawers/BillDrawer/BillPaymentTransactions/BillPaymentTransactionTable.tsx b/packages/webapp/src/containers/Drawers/BillDrawer/BillPaymentTransactions/BillPaymentTransactionTable.tsx index a42286f1d..8166031da 100644 --- a/packages/webapp/src/containers/Drawers/BillDrawer/BillPaymentTransactions/BillPaymentTransactionTable.tsx +++ b/packages/webapp/src/containers/Drawers/BillDrawer/BillPaymentTransactions/BillPaymentTransactionTable.tsx @@ -48,7 +48,7 @@ function BillPaymentTransactionTable({ // Handles edit bill payment transactions. const handleEditBillPaymentTransactions = ({ bill_payment_id }) => { - history.push(`/payment-mades/${bill_payment_id}/edit`); + history.push(`/payments-made/${bill_payment_id}/edit`); closeDrawer(DRAWERS.BILL_DETAILS); }; diff --git a/packages/webapp/src/containers/Drawers/PaymentMadeDetailDrawer/PaymentMadeDetailActionsBar.tsx b/packages/webapp/src/containers/Drawers/PaymentMadeDetailDrawer/PaymentMadeDetailActionsBar.tsx index cc1a810c6..8e70ff369 100644 --- a/packages/webapp/src/containers/Drawers/PaymentMadeDetailDrawer/PaymentMadeDetailActionsBar.tsx +++ b/packages/webapp/src/containers/Drawers/PaymentMadeDetailDrawer/PaymentMadeDetailActionsBar.tsx @@ -42,7 +42,7 @@ function PaymentMadeDetailActionsBar({ // Handle edit payment made. const handleEditPaymentMade = () => { - history.push(`/payment-mades/${paymentMadeId}/edit`); + history.push(`/payments-made/${paymentMadeId}/edit`); closeDrawer(DRAWERS.PAYMENT_MADE_DETAILS); }; diff --git a/packages/webapp/src/containers/Drawers/VendorDetailsDrawer/VendorDetailsActionsBar.tsx b/packages/webapp/src/containers/Drawers/VendorDetailsDrawer/VendorDetailsActionsBar.tsx index 3c811518a..d6839dab3 100644 --- a/packages/webapp/src/containers/Drawers/VendorDetailsDrawer/VendorDetailsActionsBar.tsx +++ b/packages/webapp/src/containers/Drawers/VendorDetailsDrawer/VendorDetailsActionsBar.tsx @@ -71,7 +71,7 @@ function VendorDetailsActionsBar({ }; const handleNewPaymentClick = () => { - history.push('/payment-mades/new'); + history.push('/payments-made/new'); closeDrawer(DRAWERS.VENDOR_DETAILS); }; diff --git a/packages/webapp/src/containers/Purchases/PaymentMades/PaymentForm/PaymentMadeDialogs.tsx b/packages/webapp/src/containers/Purchases/PaymentsMade/PaymentForm/PaymentMadeDialogs.tsx similarity index 100% rename from packages/webapp/src/containers/Purchases/PaymentMades/PaymentForm/PaymentMadeDialogs.tsx rename to packages/webapp/src/containers/Purchases/PaymentsMade/PaymentForm/PaymentMadeDialogs.tsx diff --git a/packages/webapp/src/containers/Purchases/PaymentMades/PaymentForm/PaymentMadeEntriesTable.tsx b/packages/webapp/src/containers/Purchases/PaymentsMade/PaymentForm/PaymentMadeEntriesTable.tsx similarity index 100% rename from packages/webapp/src/containers/Purchases/PaymentMades/PaymentForm/PaymentMadeEntriesTable.tsx rename to packages/webapp/src/containers/Purchases/PaymentsMade/PaymentForm/PaymentMadeEntriesTable.tsx diff --git a/packages/webapp/src/containers/Purchases/PaymentMades/PaymentForm/PaymentMadeFloatingActions.tsx b/packages/webapp/src/containers/Purchases/PaymentsMade/PaymentForm/PaymentMadeFloatingActions.tsx similarity index 100% rename from packages/webapp/src/containers/Purchases/PaymentMades/PaymentForm/PaymentMadeFloatingActions.tsx rename to packages/webapp/src/containers/Purchases/PaymentsMade/PaymentForm/PaymentMadeFloatingActions.tsx diff --git a/packages/webapp/src/containers/Purchases/PaymentMades/PaymentForm/PaymentMadeFooter.tsx b/packages/webapp/src/containers/Purchases/PaymentsMade/PaymentForm/PaymentMadeFooter.tsx similarity index 100% rename from packages/webapp/src/containers/Purchases/PaymentMades/PaymentForm/PaymentMadeFooter.tsx rename to packages/webapp/src/containers/Purchases/PaymentsMade/PaymentForm/PaymentMadeFooter.tsx diff --git a/packages/webapp/src/containers/Purchases/PaymentMades/PaymentForm/PaymentMadeForm.schema.tsx b/packages/webapp/src/containers/Purchases/PaymentsMade/PaymentForm/PaymentMadeForm.schema.tsx similarity index 100% rename from packages/webapp/src/containers/Purchases/PaymentMades/PaymentForm/PaymentMadeForm.schema.tsx rename to packages/webapp/src/containers/Purchases/PaymentsMade/PaymentForm/PaymentMadeForm.schema.tsx diff --git a/packages/webapp/src/containers/Purchases/PaymentMades/PaymentForm/PaymentMadeForm.tsx b/packages/webapp/src/containers/Purchases/PaymentsMade/PaymentForm/PaymentMadeForm.tsx similarity index 98% rename from packages/webapp/src/containers/Purchases/PaymentMades/PaymentForm/PaymentMadeForm.tsx rename to packages/webapp/src/containers/Purchases/PaymentsMade/PaymentForm/PaymentMadeForm.tsx index 72b2e033c..e144981d0 100644 --- a/packages/webapp/src/containers/Purchases/PaymentMades/PaymentForm/PaymentMadeForm.tsx +++ b/packages/webapp/src/containers/Purchases/PaymentsMade/PaymentForm/PaymentMadeForm.tsx @@ -120,7 +120,7 @@ function PaymentMadeForm({ }); setSubmitting(false); - submitPayload.redirect && history.push('/payment-mades'); + submitPayload.redirect && history.push('/payments-made'); submitPayload.resetForm && resetForm(); }; diff --git a/packages/webapp/src/containers/Purchases/PaymentMades/PaymentForm/PaymentMadeFormBody.tsx b/packages/webapp/src/containers/Purchases/PaymentsMade/PaymentForm/PaymentMadeFormBody.tsx similarity index 100% rename from packages/webapp/src/containers/Purchases/PaymentMades/PaymentForm/PaymentMadeFormBody.tsx rename to packages/webapp/src/containers/Purchases/PaymentsMade/PaymentForm/PaymentMadeFormBody.tsx diff --git a/packages/webapp/src/containers/Purchases/PaymentMades/PaymentForm/PaymentMadeFormCurrencyTag.tsx b/packages/webapp/src/containers/Purchases/PaymentsMade/PaymentForm/PaymentMadeFormCurrencyTag.tsx similarity index 100% rename from packages/webapp/src/containers/Purchases/PaymentMades/PaymentForm/PaymentMadeFormCurrencyTag.tsx rename to packages/webapp/src/containers/Purchases/PaymentsMade/PaymentForm/PaymentMadeFormCurrencyTag.tsx diff --git a/packages/webapp/src/containers/Purchases/PaymentMades/PaymentForm/PaymentMadeFormFooterLeft.tsx b/packages/webapp/src/containers/Purchases/PaymentsMade/PaymentForm/PaymentMadeFormFooterLeft.tsx similarity index 100% rename from packages/webapp/src/containers/Purchases/PaymentMades/PaymentForm/PaymentMadeFormFooterLeft.tsx rename to packages/webapp/src/containers/Purchases/PaymentsMade/PaymentForm/PaymentMadeFormFooterLeft.tsx diff --git a/packages/webapp/src/containers/Purchases/PaymentMades/PaymentForm/PaymentMadeFormFooterRight.tsx b/packages/webapp/src/containers/Purchases/PaymentsMade/PaymentForm/PaymentMadeFormFooterRight.tsx similarity index 100% rename from packages/webapp/src/containers/Purchases/PaymentMades/PaymentForm/PaymentMadeFormFooterRight.tsx rename to packages/webapp/src/containers/Purchases/PaymentsMade/PaymentForm/PaymentMadeFormFooterRight.tsx diff --git a/packages/webapp/src/containers/Purchases/PaymentMades/PaymentForm/PaymentMadeFormHeader.tsx b/packages/webapp/src/containers/Purchases/PaymentsMade/PaymentForm/PaymentMadeFormHeader.tsx similarity index 100% rename from packages/webapp/src/containers/Purchases/PaymentMades/PaymentForm/PaymentMadeFormHeader.tsx rename to packages/webapp/src/containers/Purchases/PaymentsMade/PaymentForm/PaymentMadeFormHeader.tsx diff --git a/packages/webapp/src/containers/Purchases/PaymentMades/PaymentForm/PaymentMadeFormHeaderFields.tsx b/packages/webapp/src/containers/Purchases/PaymentsMade/PaymentForm/PaymentMadeFormHeaderFields.tsx similarity index 100% rename from packages/webapp/src/containers/Purchases/PaymentMades/PaymentForm/PaymentMadeFormHeaderFields.tsx rename to packages/webapp/src/containers/Purchases/PaymentsMade/PaymentForm/PaymentMadeFormHeaderFields.tsx diff --git a/packages/webapp/src/containers/Purchases/PaymentMades/PaymentForm/PaymentMadeFormPage.tsx b/packages/webapp/src/containers/Purchases/PaymentsMade/PaymentForm/PaymentMadeFormPage.tsx similarity index 100% rename from packages/webapp/src/containers/Purchases/PaymentMades/PaymentForm/PaymentMadeFormPage.tsx rename to packages/webapp/src/containers/Purchases/PaymentsMade/PaymentForm/PaymentMadeFormPage.tsx diff --git a/packages/webapp/src/containers/Purchases/PaymentMades/PaymentForm/PaymentMadeFormProvider.tsx b/packages/webapp/src/containers/Purchases/PaymentsMade/PaymentForm/PaymentMadeFormProvider.tsx similarity index 100% rename from packages/webapp/src/containers/Purchases/PaymentMades/PaymentForm/PaymentMadeFormProvider.tsx rename to packages/webapp/src/containers/Purchases/PaymentsMade/PaymentForm/PaymentMadeFormProvider.tsx diff --git a/packages/webapp/src/containers/Purchases/PaymentMades/PaymentForm/PaymentMadeFormTopBar.tsx b/packages/webapp/src/containers/Purchases/PaymentsMade/PaymentForm/PaymentMadeFormTopBar.tsx similarity index 100% rename from packages/webapp/src/containers/Purchases/PaymentMades/PaymentForm/PaymentMadeFormTopBar.tsx rename to packages/webapp/src/containers/Purchases/PaymentsMade/PaymentForm/PaymentMadeFormTopBar.tsx diff --git a/packages/webapp/src/containers/Purchases/PaymentMades/PaymentForm/PaymentMadeInnerProvider.tsx b/packages/webapp/src/containers/Purchases/PaymentsMade/PaymentForm/PaymentMadeInnerProvider.tsx similarity index 100% rename from packages/webapp/src/containers/Purchases/PaymentMades/PaymentForm/PaymentMadeInnerProvider.tsx rename to packages/webapp/src/containers/Purchases/PaymentsMade/PaymentForm/PaymentMadeInnerProvider.tsx diff --git a/packages/webapp/src/containers/Purchases/PaymentMades/PaymentForm/components.tsx b/packages/webapp/src/containers/Purchases/PaymentsMade/PaymentForm/components.tsx similarity index 100% rename from packages/webapp/src/containers/Purchases/PaymentMades/PaymentForm/components.tsx rename to packages/webapp/src/containers/Purchases/PaymentsMade/PaymentForm/components.tsx diff --git a/packages/webapp/src/containers/Purchases/PaymentMades/PaymentForm/dialogs/PaymentMadeExcessDialog/PaymentMadeExcessDialog.tsx b/packages/webapp/src/containers/Purchases/PaymentsMade/PaymentForm/dialogs/PaymentMadeExcessDialog/PaymentMadeExcessDialog.tsx similarity index 100% rename from packages/webapp/src/containers/Purchases/PaymentMades/PaymentForm/dialogs/PaymentMadeExcessDialog/PaymentMadeExcessDialog.tsx rename to packages/webapp/src/containers/Purchases/PaymentsMade/PaymentForm/dialogs/PaymentMadeExcessDialog/PaymentMadeExcessDialog.tsx diff --git a/packages/webapp/src/containers/Purchases/PaymentMades/PaymentForm/dialogs/PaymentMadeExcessDialog/PaymentMadeExcessDialogContent.tsx b/packages/webapp/src/containers/Purchases/PaymentsMade/PaymentForm/dialogs/PaymentMadeExcessDialog/PaymentMadeExcessDialogContent.tsx similarity index 100% rename from packages/webapp/src/containers/Purchases/PaymentMades/PaymentForm/dialogs/PaymentMadeExcessDialog/PaymentMadeExcessDialogContent.tsx rename to packages/webapp/src/containers/Purchases/PaymentsMade/PaymentForm/dialogs/PaymentMadeExcessDialog/PaymentMadeExcessDialogContent.tsx diff --git a/packages/webapp/src/containers/Purchases/PaymentMades/PaymentForm/dialogs/PaymentMadeExcessDialog/index.ts b/packages/webapp/src/containers/Purchases/PaymentsMade/PaymentForm/dialogs/PaymentMadeExcessDialog/index.ts similarity index 100% rename from packages/webapp/src/containers/Purchases/PaymentMades/PaymentForm/dialogs/PaymentMadeExcessDialog/index.ts rename to packages/webapp/src/containers/Purchases/PaymentsMade/PaymentForm/dialogs/PaymentMadeExcessDialog/index.ts diff --git a/packages/webapp/src/containers/Purchases/PaymentMades/PaymentForm/utils.tsx b/packages/webapp/src/containers/Purchases/PaymentsMade/PaymentForm/utils.tsx similarity index 100% rename from packages/webapp/src/containers/Purchases/PaymentMades/PaymentForm/utils.tsx rename to packages/webapp/src/containers/Purchases/PaymentsMade/PaymentForm/utils.tsx diff --git a/packages/webapp/src/containers/Purchases/PaymentMades/PaymentsLanding/PaymentMadeActionsBar.tsx b/packages/webapp/src/containers/Purchases/PaymentsMade/PaymentsLanding/PaymentMadeActionsBar.tsx similarity index 98% rename from packages/webapp/src/containers/Purchases/PaymentMades/PaymentsLanding/PaymentMadeActionsBar.tsx rename to packages/webapp/src/containers/Purchases/PaymentsMade/PaymentsLanding/PaymentMadeActionsBar.tsx index d7bcad9f9..3d2618618 100644 --- a/packages/webapp/src/containers/Purchases/PaymentMades/PaymentsLanding/PaymentMadeActionsBar.tsx +++ b/packages/webapp/src/containers/Purchases/PaymentsMade/PaymentsLanding/PaymentMadeActionsBar.tsx @@ -68,7 +68,7 @@ function PaymentMadeActionsBar({ // Handle new payment made button click. const handleClickNewPaymentMade = () => { - history.push('/payment-mades/new'); + history.push('/payments-made/new'); }; // Handle tab changing. const handleTabChange = (viewSlug) => { @@ -84,7 +84,7 @@ function PaymentMadeActionsBar({ }; // Handle the import button click. const handleImportBtnClick = () => { - history.push('/payment-mades/import'); + history.push('/payments-made/import'); }; // Handle the export button click. const handleExportBtnClick = () => { diff --git a/packages/webapp/src/containers/Purchases/PaymentMades/PaymentsLanding/PaymentMadeList.tsx b/packages/webapp/src/containers/Purchases/PaymentsMade/PaymentsLanding/PaymentMadeList.tsx similarity index 100% rename from packages/webapp/src/containers/Purchases/PaymentMades/PaymentsLanding/PaymentMadeList.tsx rename to packages/webapp/src/containers/Purchases/PaymentsMade/PaymentsLanding/PaymentMadeList.tsx diff --git a/packages/webapp/src/containers/Purchases/PaymentMades/PaymentsLanding/PaymentMadeViewTabs.tsx b/packages/webapp/src/containers/Purchases/PaymentsMade/PaymentsLanding/PaymentMadeViewTabs.tsx similarity index 97% rename from packages/webapp/src/containers/Purchases/PaymentMades/PaymentsLanding/PaymentMadeViewTabs.tsx rename to packages/webapp/src/containers/Purchases/PaymentsMade/PaymentsLanding/PaymentMadeViewTabs.tsx index a5177e982..a4103394a 100644 --- a/packages/webapp/src/containers/Purchases/PaymentMades/PaymentsLanding/PaymentMadeViewTabs.tsx +++ b/packages/webapp/src/containers/Purchases/PaymentsMade/PaymentsLanding/PaymentMadeViewTabs.tsx @@ -37,7 +37,7 @@ function PaymentMadeViewTabs({ ); const handleClickNewView = () => { - history.push('/custom_views/payment-mades/new'); + history.push('/custom_views/payments-made/new'); }; return ( diff --git a/packages/webapp/src/containers/Purchases/PaymentMades/PaymentsLanding/PaymentMadesEmptyStatus.tsx b/packages/webapp/src/containers/Purchases/PaymentsMade/PaymentsLanding/PaymentMadesEmptyStatus.tsx similarity index 95% rename from packages/webapp/src/containers/Purchases/PaymentMades/PaymentsLanding/PaymentMadesEmptyStatus.tsx rename to packages/webapp/src/containers/Purchases/PaymentsMade/PaymentsLanding/PaymentMadesEmptyStatus.tsx index bea353941..2e54fc17b 100644 --- a/packages/webapp/src/containers/Purchases/PaymentMades/PaymentsLanding/PaymentMadesEmptyStatus.tsx +++ b/packages/webapp/src/containers/Purchases/PaymentsMade/PaymentsLanding/PaymentMadesEmptyStatus.tsx @@ -23,7 +23,7 @@ export default function PaymentMadesEmptyStatus() { intent={Intent.PRIMARY} large={true} onClick={() => { - history.push('/payment-mades/new'); + history.push('/payments-made/new'); }} > diff --git a/packages/webapp/src/containers/Purchases/PaymentMades/PaymentsLanding/PaymentMadesListProvider.tsx b/packages/webapp/src/containers/Purchases/PaymentsMade/PaymentsLanding/PaymentMadesListProvider.tsx similarity index 100% rename from packages/webapp/src/containers/Purchases/PaymentMades/PaymentsLanding/PaymentMadesListProvider.tsx rename to packages/webapp/src/containers/Purchases/PaymentsMade/PaymentsLanding/PaymentMadesListProvider.tsx diff --git a/packages/webapp/src/containers/Purchases/PaymentMades/PaymentsLanding/PaymentMadesTable.tsx b/packages/webapp/src/containers/Purchases/PaymentsMade/PaymentsLanding/PaymentMadesTable.tsx similarity index 98% rename from packages/webapp/src/containers/Purchases/PaymentMades/PaymentsLanding/PaymentMadesTable.tsx rename to packages/webapp/src/containers/Purchases/PaymentsMade/PaymentsLanding/PaymentMadesTable.tsx index 56daabb98..0a10ab1d3 100644 --- a/packages/webapp/src/containers/Purchases/PaymentMades/PaymentsLanding/PaymentMadesTable.tsx +++ b/packages/webapp/src/containers/Purchases/PaymentsMade/PaymentsLanding/PaymentMadesTable.tsx @@ -61,7 +61,7 @@ function PaymentMadesTable({ // Handles the edit payment made action. const handleEditPaymentMade = (paymentMade) => { - history.push(`/payment-mades/${paymentMade.id}/edit`); + history.push(`/payments-made/${paymentMade.id}/edit`); }; // Handles the delete payment made action. diff --git a/packages/webapp/src/containers/Purchases/PaymentMades/PaymentsLanding/PaymentMadesView.tsx b/packages/webapp/src/containers/Purchases/PaymentsMade/PaymentsLanding/PaymentMadesView.tsx similarity index 91% rename from packages/webapp/src/containers/Purchases/PaymentMades/PaymentsLanding/PaymentMadesView.tsx rename to packages/webapp/src/containers/Purchases/PaymentsMade/PaymentsLanding/PaymentMadesView.tsx index ea35cdeae..78c82589e 100644 --- a/packages/webapp/src/containers/Purchases/PaymentMades/PaymentsLanding/PaymentMadesView.tsx +++ b/packages/webapp/src/containers/Purchases/PaymentsMade/PaymentsLanding/PaymentMadesView.tsx @@ -20,7 +20,7 @@ function PaymentMadesViewPage({ {/* { - history.push('/payment-mades'); + history.push('/payments-made'); }; const handleImportSuccess = () => { - history.push('/payment-mades'); + history.push('/payments-made'); }; return ( diff --git a/packages/webapp/src/containers/Purchases/PaymentMades/PaymentMadeUniversalSearch.tsx b/packages/webapp/src/containers/Purchases/PaymentsMade/PaymentsMadeUniversalSearch.tsx similarity index 84% rename from packages/webapp/src/containers/Purchases/PaymentMades/PaymentMadeUniversalSearch.tsx rename to packages/webapp/src/containers/Purchases/PaymentsMade/PaymentsMadeUniversalSearch.tsx index 890401038..ccb24a864 100644 --- a/packages/webapp/src/containers/Purchases/PaymentMades/PaymentMadeUniversalSearch.tsx +++ b/packages/webapp/src/containers/Purchases/PaymentsMade/PaymentsMadeUniversalSearch.tsx @@ -13,7 +13,7 @@ import withDrawerActions from '@/containers/Drawer/withDrawerActions'; /** * Universal search bill item select action. */ -function PaymentMadeUniversalSearchSelectComponent({ +function PaymentsMadeUniversalSearchSelectComponent({ // #ownProps resourceType, resourceId, @@ -27,14 +27,14 @@ function PaymentMadeUniversalSearchSelectComponent({ return null; } -export const PaymentMadeUniversalSearchSelect = withDrawerActions( - PaymentMadeUniversalSearchSelectComponent, +export const PaymentsMadeUniversalSearchSelect = withDrawerActions( + PaymentsMadeUniversalSearchSelectComponent, ); /** * Payment made universal search item. */ -export function PaymentMadeUniversalSearchItem( +export function PaymentsMadeUniversalSearchItem( { text, label, reference }, { handleClick, modifiers, query }, ) { @@ -78,9 +78,9 @@ const paymentMadeToSearch = (payment) => ({ */ export const universalSearchPaymentMadeBind = () => ({ resourceType: RESOURCES_TYPES.PAYMENT_MADE, - optionItemLabel: intl.get('payment_mades'), - selectItemAction: PaymentMadeUniversalSearchSelect, - itemRenderer: PaymentMadeUniversalSearchItem, + optionItemLabel: intl.get('payments_made'), + selectItemAction: PaymentsMadeUniversalSearchSelect, + itemRenderer: PaymentsMadeUniversalSearchItem, itemSelect: paymentMadeToSearch, permission: { ability: PaymentMadeAction.View, diff --git a/packages/webapp/src/containers/Purchases/PaymentMades/constants.ts b/packages/webapp/src/containers/Purchases/PaymentsMade/constants.ts similarity index 100% rename from packages/webapp/src/containers/Purchases/PaymentMades/constants.ts rename to packages/webapp/src/containers/Purchases/PaymentsMade/constants.ts diff --git a/packages/webapp/src/containers/UniversalSearch/DashboardUniversalSearchBinds.tsx b/packages/webapp/src/containers/UniversalSearch/DashboardUniversalSearchBinds.tsx index 6ce67a73a..efcd9658a 100644 --- a/packages/webapp/src/containers/UniversalSearch/DashboardUniversalSearchBinds.tsx +++ b/packages/webapp/src/containers/UniversalSearch/DashboardUniversalSearchBinds.tsx @@ -4,7 +4,7 @@ import { universalSearchReceiptBind } from '../Sales/Receipts/ReceiptUniversalSe import { universalSearchBillBind } from '../Purchases/Bills/BillUniversalSearch'; import { universalSearchEstimateBind } from '../Sales/Estimates/EstimatesLanding/EstimateUniversalSearch'; import { universalSearchPaymentReceiveBind } from '../Sales/PaymentReceives/PaymentReceiveUniversalSearch'; -import { universalSearchPaymentMadeBind } from '../Purchases/PaymentMades/PaymentMadeUniversalSearch'; +import { universalSearchPaymentMadeBind } from '../Purchases/PaymentsMade/PaymentsMadeUniversalSearch'; import { universalSearchItemBind } from '../Items/ItemsUniversalSearch'; import { universalSearchCustomerBind } from '../Customers/CustomersUniversalSearch'; import { universalSearchJournalBind } from '../Accounting/ManualJournalUniversalSearch'; diff --git a/packages/webapp/src/lang/ar/index.json b/packages/webapp/src/lang/ar/index.json index 1b54729c4..ebea8889b 100644 --- a/packages/webapp/src/lang/ar/index.json +++ b/packages/webapp/src/lang/ar/index.json @@ -618,7 +618,7 @@ "bill_amount": "مبلغ الفاتورة", "payment_no_": "رقم سند الدفع", "new_payment_made": "سند موردين جديد", - "payment_made_list": "قائمة سندات الموردين", + "payments_made_list": "قائمة سندات الموردين", "select_vender_account": "اختار حساب المورد", "the_payment_made_has_been_edited_successfully": "تم تعديل سند المورد التي تم إجراؤه بنجاح.", "the_payment_made_has_been_created_successfully": "تم إنشاء سند مورد بنجاح.", diff --git a/packages/webapp/src/lang/en/index.json b/packages/webapp/src/lang/en/index.json index 39f053f74..15e9198ea 100644 --- a/packages/webapp/src/lang/en/index.json +++ b/packages/webapp/src/lang/en/index.json @@ -586,7 +586,7 @@ "the_payment_receive_transaction_has_been_edited": "The payment receive 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?", "select_invoice": "Select Invoice", - "payment_mades": "Payment Mades", + "payments_made": "Payments Made", "subscription": "Subscription", "plan_slug": "Plan slug", "billing": "Billing", @@ -615,14 +615,14 @@ "bill_amount": "Bill Amount", "payment_no_": "Payment number", "new_payment_made": "New Payment Made", - "payment_made_list": "Payment Made List", + "payments_made_list": "Payments Made List", "payment_account": "Payment Account", "select_vender_account": "Select Vender Account...", "select_payment_account": "Select Payment Account...", "the_payment_made_has_been_edited_successfully": "The payment made has been edited successfully.", "the_payment_made_has_been_created_successfully": "The payment made has been created successfully.", "the_payment_made_has_been_deleted_successfully": "The payment made has been deleted successfully.", - "once_delete_this_payment_made_you_will_able_to_restore_it": "Once you delete this payment made, you won't be able to restore it later. Are you sure you want to delete this payment made?", + "once_delete_this_payment_made_you_will_able_to_restore_it": "Once you delete this payment transaction, you won't be able to restore it later. Are you sure you want to delete this payment made?", "sellable": "Sellable", "purchasable": "Purchasable", "sell_account": "Sell Account", @@ -941,7 +941,7 @@ "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", + "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", @@ -1741,7 +1741,7 @@ "credit_note.drawer.subtitle": "Branch: {value}", "payment_receive.drawer.title": "Payment receive details ({number})", "payment_receive.drawer.subtitle": "Branch: {value}", - "payment_made.drawer.title": "Payment made details {number}", + "payment_made.drawer.title": "Payment Made Details {number}", "payment_made.drawer.subtitle": "Branch: {value}", "manual_journal.drawer.title": "Manual journal details ({number})", "expense.drawer.title": "Expense details", @@ -2197,7 +2197,7 @@ "sidebar.purchases": "Purchases", "sidebar.bills": "Bills", "sidebar.vendor_credits": "Vendor Credits", - "sidebar.payment_mades": "Payment Mades", + "sidebar.payments_made": "Payments Made", "sidebar.new_purchase_invoice": "New Purchase Invoice", "sidebar.new_vendor_credit": "New Vendor Credit", "sidebar.new_payment_made": "New Payment Made", diff --git a/packages/webapp/src/routes/dashboard.tsx b/packages/webapp/src/routes/dashboard.tsx index 25765554f..7d7c61b0d 100644 --- a/packages/webapp/src/routes/dashboard.tsx +++ b/packages/webapp/src/routes/dashboard.tsx @@ -1095,9 +1095,9 @@ export const getDashboardRoutes = () => [ // Payment modes. { - path: `/payment-mades/import`, + path: `/payments-made/import`, component: lazy( - () => import('@/containers/Purchases/PaymentMades/PaymentMadesImport'), + () => import('@/containers/Purchases/PaymentsMade/PaymentsMadeImport'), ), name: 'payment-made-edit', breadcrumb: intl.get('edit'), @@ -1107,11 +1107,11 @@ export const getDashboardRoutes = () => [ subscriptionActive: [SUBSCRIPTION_TYPE.MAIN], }, { - path: `/payment-mades/:id/edit`, + path: `/payments-made/:id/edit`, component: lazy( () => import( - '@/containers/Purchases/PaymentMades/PaymentForm/PaymentMadeFormPage' + '@/containers/Purchases/PaymentsMade/PaymentForm/PaymentMadeFormPage' ), ), name: 'payment-made-edit', @@ -1123,11 +1123,11 @@ export const getDashboardRoutes = () => [ subscriptionActive: [SUBSCRIPTION_TYPE.MAIN], }, { - path: `/payment-mades/new`, + path: `/payments-made/new`, component: lazy( () => import( - '@/containers/Purchases/PaymentMades/PaymentForm/PaymentMadeFormPage' + '@/containers/Purchases/PaymentsMade/PaymentForm/PaymentMadeFormPage' ), ), name: 'payment-made-new', @@ -1139,15 +1139,15 @@ export const getDashboardRoutes = () => [ subscriptionActive: [SUBSCRIPTION_TYPE.MAIN], }, { - path: `/payment-mades`, + path: `/payments-made`, component: lazy( () => import( - '@/containers/Purchases/PaymentMades/PaymentsLanding/PaymentMadeList' + '@/containers/Purchases/PaymentsMade/PaymentsLanding/PaymentMadeList' ), ), - breadcrumb: intl.get('payment_made_list'), - pageTitle: intl.get('payment_made_list'), + breadcrumb: intl.get('payments_made_list'), + pageTitle: intl.get('payments_made_list'), defaultSearchResource: RESOURCES_TYPES.PAYMENT_MADE, subscriptionActive: [SUBSCRIPTION_TYPE.MAIN], },