From 1e3b8df702b9511f3eeb4a59161e1a5a8e5c4c79 Mon Sep 17 00:00:00 2001 From: "a.bouhuolia" Date: Sun, 21 Feb 2021 19:43:21 +0200 Subject: [PATCH] fix merge conflict. --- client/src/components/DrawersContainer.js | 8 ++++---- .../EstimateDrawer.js | 0 .../InvoiceDrawer.js | 0 .../PaymentDetails/PaymentDrawer.js} | 0 .../ReceiptDrawer.js | 0 .../Subscriptions/BillingPlansForm.js | 2 +- client/src/routes/dashboard.js | 19 +++++++++---------- .../financialStatements.reducer.js | 2 +- 8 files changed, 15 insertions(+), 16 deletions(-) rename client/src/containers/Sales/Estimates/{EstimateForm => EstimateDetails}/EstimateDrawer.js (100%) rename client/src/containers/Sales/Invoices/{InvoiceForm => InvoiceDetails}/InvoiceDrawer.js (100%) rename client/src/containers/Sales/{PaymentReceive/PaymentReceiveDrawer.js => PaymentReceives/PaymentDetails/PaymentDrawer.js} (100%) rename client/src/containers/Sales/Receipts/{ReceiptForm => ReceiptDetails}/ReceiptDrawer.js (100%) diff --git a/client/src/components/DrawersContainer.js b/client/src/components/DrawersContainer.js index f7f326347..6ec0527c1 100644 --- a/client/src/components/DrawersContainer.js +++ b/client/src/components/DrawersContainer.js @@ -1,8 +1,8 @@ import React from 'react'; -import EstimateDrawer from 'containers/Sales/Estimate/EstimateDrawer'; -import InvoiceDrawer from 'containers/Sales/Invoice/InvoiceDrawer'; -import ReceiptDrawer from 'containers/Sales/Receipt/ReceiptDrawer'; -import PaymentReceive from 'containers/Sales/PaymentReceive/PaymentReceiveDrawer'; +import EstimateDrawer from 'containers/Sales/Estimates/EstimateDetails/EstimateDrawer'; +import InvoiceDrawer from 'containers/Sales/Invoices/InvoiceDetails/InvoiceDrawer'; +import ReceiptDrawer from 'containers/Sales/Receipts/ReceiptDetails/ReceiptDrawer'; +import PaymentReceive from 'containers/Sales/PaymentReceives/PaymentDetails/PaymentDrawer'; export default function DrawersContainer() { return ( diff --git a/client/src/containers/Sales/Estimates/EstimateForm/EstimateDrawer.js b/client/src/containers/Sales/Estimates/EstimateDetails/EstimateDrawer.js similarity index 100% rename from client/src/containers/Sales/Estimates/EstimateForm/EstimateDrawer.js rename to client/src/containers/Sales/Estimates/EstimateDetails/EstimateDrawer.js diff --git a/client/src/containers/Sales/Invoices/InvoiceForm/InvoiceDrawer.js b/client/src/containers/Sales/Invoices/InvoiceDetails/InvoiceDrawer.js similarity index 100% rename from client/src/containers/Sales/Invoices/InvoiceForm/InvoiceDrawer.js rename to client/src/containers/Sales/Invoices/InvoiceDetails/InvoiceDrawer.js diff --git a/client/src/containers/Sales/PaymentReceive/PaymentReceiveDrawer.js b/client/src/containers/Sales/PaymentReceives/PaymentDetails/PaymentDrawer.js similarity index 100% rename from client/src/containers/Sales/PaymentReceive/PaymentReceiveDrawer.js rename to client/src/containers/Sales/PaymentReceives/PaymentDetails/PaymentDrawer.js diff --git a/client/src/containers/Sales/Receipts/ReceiptForm/ReceiptDrawer.js b/client/src/containers/Sales/Receipts/ReceiptDetails/ReceiptDrawer.js similarity index 100% rename from client/src/containers/Sales/Receipts/ReceiptForm/ReceiptDrawer.js rename to client/src/containers/Sales/Receipts/ReceiptDetails/ReceiptDrawer.js diff --git a/client/src/containers/Subscriptions/BillingPlansForm.js b/client/src/containers/Subscriptions/BillingPlansForm.js index cd80a4799..eedbd87e8 100644 --- a/client/src/containers/Subscriptions/BillingPlansForm.js +++ b/client/src/containers/Subscriptions/BillingPlansForm.js @@ -5,7 +5,7 @@ import 'style/pages/Subscription/BillingPlans.scss'; import BillingPlansInput from 'containers/Subscriptions/BillingPlansInput'; import BillingPeriodsInput from 'containers/Subscriptions/BillingPeriodsInput'; -import BillingPaymentMethod from 'containers/Subscriptions/BillingPaymentmethod'; +import BillingPaymentMethod from 'containers/Subscriptions/BillingPaymentMethod'; /** * Billing plans form. diff --git a/client/src/routes/dashboard.js b/client/src/routes/dashboard.js index 0f1718567..cb5583475 100644 --- a/client/src/routes/dashboard.js +++ b/client/src/routes/dashboard.js @@ -59,7 +59,7 @@ export default [ ), breadcrumb: 'Manual Journals', hotkey: 'shift+m', - pageTitle: formatMessage({ id: 'manual_journals' }) + pageTitle: formatMessage({ id: 'manual_journals' }), }, { path: `/items/categories`, @@ -112,7 +112,7 @@ export default [ hotkey: 'shift+4', pageTitle: formatMessage({ id: 'general_ledger' }), backLink: true, - sidebarShrink: true + sidebarShrink: true, }, { path: `/financial-reports/balance-sheet`, @@ -155,14 +155,13 @@ export default [ backLink: true, sidebarShrink: true, }, - { - path: '/financial-reports/payable-aging-summary', - component: LazyLoader({ - loader: () => - import('containers/FinancialStatements/APAgingSummary/APAgingSummary'), - }), - breadcrumb: 'Payable Aging Summary', - }, + // { + // path: '/financial-reports/payable-aging-summary', + // component: lazy(() => + // import('containers/FinancialStatements/APAgingSummary/APAgingSummary'), + // ), + // breadcrumb: 'Payable Aging Summary', + // }, { path: `/financial-reports/journal-sheet`, component: lazy(() => diff --git a/client/src/store/financialStatement/financialStatements.reducer.js b/client/src/store/financialStatement/financialStatements.reducer.js index 705de53e1..bd6844af9 100644 --- a/client/src/store/financialStatement/financialStatements.reducer.js +++ b/client/src/store/financialStatement/financialStatements.reducer.js @@ -197,7 +197,7 @@ export default createReducer(initialState, { columns, vendors, total, - tableRows: APAgingSummaryTableRowsMapper({ vendors, columns, total }), + // tableRows: APAgingSummaryTableRowsMapper({ vendors, columns, total }), }; state.payableAgingSummary.sheet = receivableSheet; },