From d48532a7e6339f768cdb7a966c05ae5e2a843de8 Mon Sep 17 00:00:00 2001 From: "a.bouhuolia" Date: Thu, 11 Feb 2021 20:45:06 +0200 Subject: [PATCH] refactoring: sales tables. refacoring: purchases tables. --- .../containers/Alerts/AccountActivateAlert.js | 1 + .../Alerts/AccountBulkActivateAlert.js | 6 +- .../Alerts/AccountBulkDeleteAlert.js | 3 + .../containers/Alerts/AccountDeleteAlert.js | 8 +- .../Alerts/Bills/BillDeleteAlert.js | 5 +- .../containers/Alerts/Bills/BillOpenAlert.js | 3 +- .../Alerts/Estimates/EstimateDeleteAlert.js | 2 +- .../Alerts/Estimates/EstimateRejectAlert.js | 15 +- .../Alerts/Invoices/InvoiceDeleteAlert.js | 15 +- .../Alerts/Invoices/InvoiceDeliverAlert.js | 2 - .../EstimateNumberDialogContent.js | 8 +- .../InvoiceNumberDialogContent.js | 8 +- .../PaymentReceiveNumberDialogContent.js | 11 +- .../ReceiptNumberDialogContent.js | 5 +- .../Expenses/ExpensesLanding/ExpensesList.js | 4 +- .../Purchases/Bill/BillsDataTable.js | 296 ------------------ .../Purchases/Bill/BillsViewPage.js | 49 --- .../Purchases/Bill/withBillActions.js | 40 --- .../Purchases/Bill/withBillDetail.js | 11 - .../containers/Purchases/Bill/withBills.js | 40 --- .../BillForm}/BillFloatingActions.js | 0 .../{Bill => Bills/BillForm}/BillForm.js | 0 .../BillForm}/BillForm.schema.js | 0 .../{Bill => Bills/BillForm}/BillFormBody.js | 0 .../BillForm}/BillFormFooter.js | 0 .../BillForm}/BillFormHeader.js | 0 .../BillForm}/BillFormHeaderFields.js | 0 .../{Bill => Bills/BillForm}/BillFormPage.js | 0 .../BillForm}/BillFormProvider.js | 0 .../BillsLanding}/BillsActionsBar.js | 25 +- .../BillsLanding}/BillsAlerts.js | 0 .../BillsLanding}/BillsEmptyStatus.js | 0 .../{Bill => Bills/BillsLanding}/BillsList.js | 21 +- .../BillsLanding}/BillsListProvider.js | 15 +- .../Bills/BillsLanding/BillsTable.js | 108 +++++++ .../BillsLanding/BillsViewsTabs.js} | 11 +- .../Bills/BillsLanding/components.js | 167 ++++++++++ .../Purchases/Bills/BillsLanding/withBills.js | 14 + .../Bills/BillsLanding/withBillsActions.js | 8 + .../PaymentMadeFloatingActions.js | 0 .../{ => PaymentForm}/PaymentMadeFooter.js | 0 .../{ => PaymentForm}/PaymentMadeForm.js | 0 .../PaymentMadeForm.schema.js | 0 .../PaymentMadeFormHeader.js | 0 .../{ => PaymentForm}/PaymentMadeFormPage.js | 0 .../PaymentMadeItemsTable.js | 0 .../PaymentMadeItemsTableEditor.js | 0 .../PaymentMades/PaymentMadeDataTable.js | 249 --------------- .../PaymentMades/PaymentMadesAlerts.js | 2 +- .../PaymentMadeActionsBar.js | 10 +- .../{ => PaymentsLanding}/PaymentMadeList.js | 25 +- .../PaymentMadeViewTabs.js | 27 +- .../PaymentMadesEmptyStatus.js | 0 .../PaymentMadesListProvider.js | 23 +- .../PaymentsLanding/PaymentMadesTable.js | 95 ++++++ .../{ => PaymentsLanding}/PaymentMadesView.js | 2 +- .../PaymentMdesListProvider.js | 0 .../PaymentsLanding/components.js | 133 ++++++++ .../PaymentsLanding/withPaymentMade.js | 16 + .../PaymentsLanding/withPaymentMadeActions.js | 8 + .../withPaymentMadeDetail.js | 0 .../Purchases/PaymentMades/withPaymentMade.js | 39 --- .../PaymentMades/withPaymentMadeActions.js | 39 --- .../Sales/Estimate/EstiamtesViewPage.js | 84 ----- .../Sales/Estimate/EstimatesDataTable.js | 292 ----------------- .../containers/Sales/Estimate/components.js | 31 -- .../Sales/Estimate/withEstimateActions.js | 48 --- .../Sales/Estimate/withEstimates.js | 36 --- .../EstimateForm}/EntriesItemsTable.js | 0 .../EstimateForm}/EstimateFloatingActions.js | 0 .../EstimateForm}/EstimateForm.js | 0 .../EstimateForm}/EstimateForm.schema.js | 0 .../EstimateForm}/EstimateFormBody.js | 0 .../EstimateForm}/EstimateFormFooter.js | 0 .../EstimateForm}/EstimateFormHeader.js | 0 .../EstimateForm}/EstimateFormHeaderFields.js | 0 .../EstimateForm}/EstimateFormPage.js | 0 .../EstimateForm}/EstimateNumberWatcher.js | 0 .../EstimatesAlerts.js | 0 .../EstimatesLanding/EstimatesActionsBar.js} | 12 +- .../EstimatesLanding/EstimatesDataTable.js | 127 ++++++++ .../EstimatesLanding}/EstimatesEmptyStatus.js | 0 .../EstimatesLanding}/EstimatesList.js | 27 +- .../EstimatesListProvider.js | 23 +- .../EstimatesLanding/EstimatesViewTabs.js} | 24 +- .../Estimates/EstimatesLanding/components.js | 195 ++++++++++++ .../EstimatesLanding/withEstimates.js | 16 + .../EstimatesLanding/withEstimatesActions.js | 10 + .../withEstimateDetail.js | 0 .../Sales/Invoice/InvoicesDataTable.js | 273 ---------------- .../Sales/Invoice/InvoicesViewPage.js | 73 ----- .../containers/Sales/Invoice/components.js | 79 ----- .../Sales/Invoice/withInvoiceActions.js | 40 --- .../Sales/Invoice/withInvoiceDetail.js | 11 - .../containers/Sales/Invoice/withInvoices.js | 42 --- .../InvoiceForm}/InvoiceFloatingActions.js | 0 .../InvoiceForm}/InvoiceForm.js | 0 .../InvoiceForm}/InvoiceForm.schema.js | 0 .../InvoiceForm}/InvoiceFormFooter.js | 0 .../InvoiceForm}/InvoiceFormHeader.js | 0 .../InvoiceForm}/InvoiceFormHeaderFields.js | 0 .../InvoiceForm}/InvoiceFormPage.js | 0 .../InvoiceForm}/InvoiceFormProvider.js | 0 .../InvoiceNumberChangeWatcher.js | 0 .../{Invoice => Invoices}/InvoicesAlerts.js | 0 .../InvoicesLanding}/InvoiceActionsBar.js | 8 +- .../InvoicesLanding}/InvoiceViewTabs.js | 17 +- .../InvoicesLanding/InvoicesDataTable.js | 119 +++++++ .../InvoicesLanding}/InvoicesEmptyStatus.js | 0 .../InvoicesLanding}/InvoicesList.js | 23 +- .../InvoicesLanding}/InvoicesListProvider.js | 19 +- .../Invoices/InvoicesLanding/components.js | 206 ++++++++++++ .../InvoicesLanding/withInvoiceActions.js | 10 + .../Invoices/InvoicesLanding/withInvoices.js | 16 + .../PaymentReceiveFloatingActions.js | 0 .../PaymentReceiveForm.js | 0 .../PaymentReceiveForm.schema.js | 0 .../PaymentReceiveFormFooter.js | 0 .../PaymentReceiveFormHeader.js | 0 .../PaymentReceiveFormPage.js | 0 .../PaymentReceiveItemsTable.js | 0 .../PaymentReceiveItemsTableEditor.js | 0 .../PaymentReceivesDataTable.js | 256 --------------- .../PaymentReceive/PaymentReceivesViewPage.js | 55 ---- .../PaymentReceiptsListProvider.js | 38 ++- .../PaymentReceiveActionsBar.js | 86 ++--- .../PaymentReceiveViewTabs.js | 27 +- .../PaymentReceivesEmptyStatus.js | 0 .../PaymentReceivesList.js | 26 +- .../PaymentReceivesListProvider.js | 6 +- .../PaymentsLanding/PaymentReceivesTable.js | 105 +++++++ .../PaymentsLanding/components.js | 137 ++++++++ .../withPaymentReceiveDetail.js | 0 .../PaymentsLanding/withPaymentReceives.js | 16 + .../withPaymentReceivesActions.js | 9 + .../PaymentReceive/withPaymentReceives.js | 34 -- .../withPaymentReceivesActions.js | 39 --- .../Sales/Receipt/ReceiptsDataTable.js | 290 ----------------- .../Sales/Receipt/ReceiptsViewPage.js | 66 ---- .../Sales/Receipt/withReceiptActions.js | 40 --- .../Sales/Receipt/withReceiptDetail.js | 11 - .../containers/Sales/Receipt/withReceipts.js | 35 --- .../ReceiptForm}/ReceiptForm.js | 0 .../ReceiptForm}/ReceiptForm.schema.js | 0 .../ReceiptForm}/ReceiptFormBody.js | 0 .../ReceiptFormFloatingActions.js | 0 .../ReceiptForm}/ReceiptFormFooter.js | 0 .../ReceiptForm}/ReceiptFormHeader.js | 0 .../ReceiptForm}/ReceiptFormHeaderFields.js | 0 .../ReceiptForm}/ReceiptFormPage.js | 0 .../ReceiptForm}/ReceiptFormProvider.js | 0 .../ReceiptForm}/ReceiptNumberWatcher.js | 0 .../{Receipt => Receipts}/ReceiptsAlerts.js | 0 .../ReceiptsLanding}/ReceiptActionsBar.js | 26 +- .../ReceiptsLanding}/ReceiptViewTabs.js | 31 +- .../ReceiptsLanding}/ReceiptsEmptyStatus.js | 0 .../ReceiptsLanding}/ReceiptsList.js | 22 +- .../ReceiptsLanding}/ReceiptsListProvider.js | 19 +- .../Receipts/ReceiptsLanding/ReceiptsTable.js | 126 ++++++++ .../Receipts/ReceiptsLanding/components.js | 155 +++++++++ .../Receipts/ReceiptsLanding/withReceipts.js | 16 + .../ReceiptsLanding/withReceiptsActions.js | 8 + client/src/hooks/query/bills.js | 59 ++-- client/src/hooks/query/estimates.js | 72 ++--- client/src/hooks/query/financialReports.js | 177 ++++++----- client/src/hooks/query/invoices.js | 62 ++-- client/src/hooks/query/paymentMades.js | 51 +-- client/src/hooks/query/paymentReceives.js | 49 +-- client/src/hooks/query/receipts.js | 61 ++-- client/src/routes/dashboard.js | 142 ++++----- client/src/store/Bills/bills.actions.js | 154 +-------- client/src/store/Bills/bills.reducer.js | 128 +------- client/src/store/Bills/bills.selectors.js | 122 +------- client/src/store/Bills/bills.type.js | 18 +- .../src/store/Estimate/estimates.actions.js | 137 +------- .../src/store/Estimate/estimates.reducer.js | 113 +------ .../src/store/Estimate/estimates.selectors.js | 74 +---- client/src/store/Estimate/estimates.types.js | 13 +- client/src/store/Invoice/invoices.actions.js | 158 +--------- client/src/store/Invoice/invoices.reducer.js | 112 +------ client/src/store/Invoice/invoices.selector.js | 101 +----- client/src/store/Invoice/invoices.types.js | 22 +- .../store/PaymentMades/paymentMade.actions.js | 160 ---------- .../store/PaymentMades/paymentMade.reducer.js | 88 ------ .../PaymentMades/paymentMade.selector.js | 129 -------- .../store/PaymentMades/paymentMade.type.js | 12 - .../PaymentMades/paymentMades.actions.js | 10 + .../PaymentMades/paymentMades.reducer.js | 16 + .../PaymentMades/paymentMades.selector.js | 17 + .../store/PaymentMades/paymentMades.type.js | 3 + .../PaymentReceive/paymentReceive.actions.js | 144 --------- .../PaymentReceive/paymentReceive.reducer.js | 95 ------ .../PaymentReceive/paymentReceive.selector.js | 136 -------- .../PaymentReceive/paymentReceive.type.js | 12 - .../paymentReceives.actions.js | 10 + .../paymentReceives.reducer.js | 15 + .../paymentReceives.selector.js | 18 ++ .../PaymentReceives/paymentReceives.type.js | 3 + client/src/store/receipt/receipt.actions.js | 124 -------- client/src/store/receipt/receipt.reducer.js | 101 ------ client/src/store/receipt/receipt.selector.js | 66 ---- client/src/store/receipt/receipt.type.js | 13 - client/src/store/receipts/receipts.actions.js | 10 + client/src/store/receipts/receipts.reducer.js | 15 + .../src/store/receipts/receipts.selector.js | 17 + client/src/store/receipts/receipts.type.js | 4 + client/src/store/reducers.js | 6 +- client/src/store/types.js | 6 +- client/src/style/pages/Expense/List.scss | 20 ++ .../src/style/pages/ManualJournal/List.scss | 7 +- 210 files changed, 2799 insertions(+), 5392 deletions(-) delete mode 100644 client/src/containers/Purchases/Bill/BillsDataTable.js delete mode 100644 client/src/containers/Purchases/Bill/BillsViewPage.js delete mode 100644 client/src/containers/Purchases/Bill/withBillActions.js delete mode 100644 client/src/containers/Purchases/Bill/withBillDetail.js delete mode 100644 client/src/containers/Purchases/Bill/withBills.js rename client/src/containers/Purchases/{Bill => Bills/BillForm}/BillFloatingActions.js (100%) rename client/src/containers/Purchases/{Bill => Bills/BillForm}/BillForm.js (100%) rename client/src/containers/Purchases/{Bill => Bills/BillForm}/BillForm.schema.js (100%) rename client/src/containers/Purchases/{Bill => Bills/BillForm}/BillFormBody.js (100%) rename client/src/containers/Purchases/{Bill => Bills/BillForm}/BillFormFooter.js (100%) rename client/src/containers/Purchases/{Bill => Bills/BillForm}/BillFormHeader.js (100%) rename client/src/containers/Purchases/{Bill => Bills/BillForm}/BillFormHeaderFields.js (100%) rename client/src/containers/Purchases/{Bill => Bills/BillForm}/BillFormPage.js (100%) rename client/src/containers/Purchases/{Bill => Bills/BillForm}/BillFormProvider.js (100%) rename client/src/containers/Purchases/{Bill => Bills/BillsLanding}/BillsActionsBar.js (90%) rename client/src/containers/Purchases/{Bill => Bills/BillsLanding}/BillsAlerts.js (100%) rename client/src/containers/Purchases/{Bill => Bills/BillsLanding}/BillsEmptyStatus.js (100%) rename client/src/containers/Purchases/{Bill => Bills/BillsLanding}/BillsList.js (70%) rename client/src/containers/Purchases/{Bill => Bills/BillsLanding}/BillsListProvider.js (74%) create mode 100644 client/src/containers/Purchases/Bills/BillsLanding/BillsTable.js rename client/src/containers/Purchases/{Bill/BillViewTabs.js => Bills/BillsLanding/BillsViewsTabs.js} (82%) create mode 100644 client/src/containers/Purchases/Bills/BillsLanding/components.js create mode 100644 client/src/containers/Purchases/Bills/BillsLanding/withBills.js create mode 100644 client/src/containers/Purchases/Bills/BillsLanding/withBillsActions.js rename client/src/containers/Purchases/PaymentMades/{ => PaymentForm}/PaymentMadeFloatingActions.js (100%) rename client/src/containers/Purchases/PaymentMades/{ => PaymentForm}/PaymentMadeFooter.js (100%) rename client/src/containers/Purchases/PaymentMades/{ => PaymentForm}/PaymentMadeForm.js (100%) rename client/src/containers/Purchases/PaymentMades/{ => PaymentForm}/PaymentMadeForm.schema.js (100%) rename client/src/containers/Purchases/PaymentMades/{ => PaymentForm}/PaymentMadeFormHeader.js (100%) rename client/src/containers/Purchases/PaymentMades/{ => PaymentForm}/PaymentMadeFormPage.js (100%) rename client/src/containers/Purchases/PaymentMades/{ => PaymentForm}/PaymentMadeItemsTable.js (100%) rename client/src/containers/Purchases/PaymentMades/{ => PaymentForm}/PaymentMadeItemsTableEditor.js (100%) delete mode 100644 client/src/containers/Purchases/PaymentMades/PaymentMadeDataTable.js rename client/src/containers/Purchases/PaymentMades/{ => PaymentsLanding}/PaymentMadeActionsBar.js (92%) rename client/src/containers/Purchases/PaymentMades/{ => PaymentsLanding}/PaymentMadeList.js (61%) rename client/src/containers/Purchases/PaymentMades/{ => PaymentsLanding}/PaymentMadeViewTabs.js (67%) rename client/src/containers/Purchases/PaymentMades/{ => PaymentsLanding}/PaymentMadesEmptyStatus.js (100%) rename client/src/containers/Purchases/PaymentMades/{ => PaymentsLanding}/PaymentMadesListProvider.js (71%) create mode 100644 client/src/containers/Purchases/PaymentMades/PaymentsLanding/PaymentMadesTable.js rename client/src/containers/Purchases/PaymentMades/{ => PaymentsLanding}/PaymentMadesView.js (96%) rename client/src/containers/Purchases/PaymentMades/{ => PaymentsLanding}/PaymentMdesListProvider.js (100%) create mode 100644 client/src/containers/Purchases/PaymentMades/PaymentsLanding/components.js create mode 100644 client/src/containers/Purchases/PaymentMades/PaymentsLanding/withPaymentMade.js create mode 100644 client/src/containers/Purchases/PaymentMades/PaymentsLanding/withPaymentMadeActions.js rename client/src/containers/Purchases/PaymentMades/{ => PaymentsLanding}/withPaymentMadeDetail.js (100%) delete mode 100644 client/src/containers/Purchases/PaymentMades/withPaymentMade.js delete mode 100644 client/src/containers/Purchases/PaymentMades/withPaymentMadeActions.js delete mode 100644 client/src/containers/Sales/Estimate/EstiamtesViewPage.js delete mode 100644 client/src/containers/Sales/Estimate/EstimatesDataTable.js delete mode 100644 client/src/containers/Sales/Estimate/components.js delete mode 100644 client/src/containers/Sales/Estimate/withEstimateActions.js delete mode 100644 client/src/containers/Sales/Estimate/withEstimates.js rename client/src/containers/Sales/{Estimate => Estimates/EstimateForm}/EntriesItemsTable.js (100%) rename client/src/containers/Sales/{Estimate => Estimates/EstimateForm}/EstimateFloatingActions.js (100%) rename client/src/containers/Sales/{Estimate => Estimates/EstimateForm}/EstimateForm.js (100%) rename client/src/containers/Sales/{Estimate => Estimates/EstimateForm}/EstimateForm.schema.js (100%) rename client/src/containers/Sales/{Estimate => Estimates/EstimateForm}/EstimateFormBody.js (100%) rename client/src/containers/Sales/{Estimate => Estimates/EstimateForm}/EstimateFormFooter.js (100%) rename client/src/containers/Sales/{Estimate => Estimates/EstimateForm}/EstimateFormHeader.js (100%) rename client/src/containers/Sales/{Estimate => Estimates/EstimateForm}/EstimateFormHeaderFields.js (100%) rename client/src/containers/Sales/{Estimate => Estimates/EstimateForm}/EstimateFormPage.js (100%) rename client/src/containers/Sales/{Estimate => Estimates/EstimateForm}/EstimateNumberWatcher.js (100%) rename client/src/containers/Sales/{Estimate => Estimates}/EstimatesAlerts.js (100%) rename client/src/containers/Sales/{Estimate/EstimateActionsBar.js => Estimates/EstimatesLanding/EstimatesActionsBar.js} (92%) create mode 100644 client/src/containers/Sales/Estimates/EstimatesLanding/EstimatesDataTable.js rename client/src/containers/Sales/{Estimate => Estimates/EstimatesLanding}/EstimatesEmptyStatus.js (100%) rename client/src/containers/Sales/{Estimate => Estimates/EstimatesLanding}/EstimatesList.js (59%) rename client/src/containers/Sales/{Estimate => Estimates/EstimatesLanding}/EstimatesListProvider.js (68%) rename client/src/containers/Sales/{Estimate/EstimateViewTabs.js => Estimates/EstimatesLanding/EstimatesViewTabs.js} (68%) create mode 100644 client/src/containers/Sales/Estimates/EstimatesLanding/components.js create mode 100644 client/src/containers/Sales/Estimates/EstimatesLanding/withEstimates.js create mode 100644 client/src/containers/Sales/Estimates/EstimatesLanding/withEstimatesActions.js rename client/src/containers/Sales/{Estimate => Estimates}/withEstimateDetail.js (100%) delete mode 100644 client/src/containers/Sales/Invoice/InvoicesDataTable.js delete mode 100644 client/src/containers/Sales/Invoice/InvoicesViewPage.js delete mode 100644 client/src/containers/Sales/Invoice/components.js delete mode 100644 client/src/containers/Sales/Invoice/withInvoiceActions.js delete mode 100644 client/src/containers/Sales/Invoice/withInvoiceDetail.js delete mode 100644 client/src/containers/Sales/Invoice/withInvoices.js rename client/src/containers/Sales/{Invoice => Invoices/InvoiceForm}/InvoiceFloatingActions.js (100%) rename client/src/containers/Sales/{Invoice => Invoices/InvoiceForm}/InvoiceForm.js (100%) rename client/src/containers/Sales/{Invoice => Invoices/InvoiceForm}/InvoiceForm.schema.js (100%) rename client/src/containers/Sales/{Invoice => Invoices/InvoiceForm}/InvoiceFormFooter.js (100%) rename client/src/containers/Sales/{Invoice => Invoices/InvoiceForm}/InvoiceFormHeader.js (100%) rename client/src/containers/Sales/{Invoice => Invoices/InvoiceForm}/InvoiceFormHeaderFields.js (100%) rename client/src/containers/Sales/{Invoice => Invoices/InvoiceForm}/InvoiceFormPage.js (100%) rename client/src/containers/Sales/{Invoice => Invoices/InvoiceForm}/InvoiceFormProvider.js (100%) rename client/src/containers/Sales/{Invoice => Invoices/InvoiceForm}/InvoiceNumberChangeWatcher.js (100%) rename client/src/containers/Sales/{Invoice => Invoices}/InvoicesAlerts.js (100%) rename client/src/containers/Sales/{Invoice => Invoices/InvoicesLanding}/InvoiceActionsBar.js (95%) rename client/src/containers/Sales/{Invoice => Invoices/InvoicesLanding}/InvoiceViewTabs.js (77%) create mode 100644 client/src/containers/Sales/Invoices/InvoicesLanding/InvoicesDataTable.js rename client/src/containers/Sales/{Invoice => Invoices/InvoicesLanding}/InvoicesEmptyStatus.js (100%) rename client/src/containers/Sales/{Invoice => Invoices/InvoicesLanding}/InvoicesList.js (68%) rename client/src/containers/Sales/{Invoice => Invoices/InvoicesLanding}/InvoicesListProvider.js (73%) create mode 100644 client/src/containers/Sales/Invoices/InvoicesLanding/components.js create mode 100644 client/src/containers/Sales/Invoices/InvoicesLanding/withInvoiceActions.js create mode 100644 client/src/containers/Sales/Invoices/InvoicesLanding/withInvoices.js rename client/src/containers/Sales/PaymentReceive/{ => PaymentReceiveForm}/PaymentReceiveFloatingActions.js (100%) rename client/src/containers/Sales/PaymentReceive/{ => PaymentReceiveForm}/PaymentReceiveForm.js (100%) rename client/src/containers/Sales/PaymentReceive/{ => PaymentReceiveForm}/PaymentReceiveForm.schema.js (100%) rename client/src/containers/Sales/PaymentReceive/{ => PaymentReceiveForm}/PaymentReceiveFormFooter.js (100%) rename client/src/containers/Sales/PaymentReceive/{ => PaymentReceiveForm}/PaymentReceiveFormHeader.js (100%) rename client/src/containers/Sales/PaymentReceive/{ => PaymentReceiveForm}/PaymentReceiveFormPage.js (100%) rename client/src/containers/Sales/PaymentReceive/{ => PaymentReceiveForm}/PaymentReceiveItemsTable.js (100%) rename client/src/containers/Sales/PaymentReceive/{ => PaymentReceiveForm}/PaymentReceiveItemsTableEditor.js (100%) delete mode 100644 client/src/containers/Sales/PaymentReceive/PaymentReceivesDataTable.js delete mode 100644 client/src/containers/Sales/PaymentReceive/PaymentReceivesViewPage.js rename client/src/containers/Sales/PaymentReceive/{ => PaymentsLanding}/PaymentReceiptsListProvider.js (53%) rename client/src/containers/Sales/PaymentReceive/{ => PaymentsLanding}/PaymentReceiveActionsBar.js (54%) rename client/src/containers/Sales/PaymentReceive/{ => PaymentsLanding}/PaymentReceiveViewTabs.js (67%) rename client/src/containers/Sales/PaymentReceive/{ => PaymentsLanding}/PaymentReceivesEmptyStatus.js (100%) rename client/src/containers/Sales/PaymentReceive/{ => PaymentsLanding}/PaymentReceivesList.js (60%) rename client/src/containers/Sales/PaymentReceive/{ => PaymentsLanding}/PaymentReceivesListProvider.js (89%) create mode 100644 client/src/containers/Sales/PaymentReceive/PaymentsLanding/PaymentReceivesTable.js create mode 100644 client/src/containers/Sales/PaymentReceive/PaymentsLanding/components.js rename client/src/containers/Sales/PaymentReceive/{ => PaymentsLanding}/withPaymentReceiveDetail.js (100%) create mode 100644 client/src/containers/Sales/PaymentReceive/PaymentsLanding/withPaymentReceives.js create mode 100644 client/src/containers/Sales/PaymentReceive/PaymentsLanding/withPaymentReceivesActions.js delete mode 100644 client/src/containers/Sales/PaymentReceive/withPaymentReceives.js delete mode 100644 client/src/containers/Sales/PaymentReceive/withPaymentReceivesActions.js delete mode 100644 client/src/containers/Sales/Receipt/ReceiptsDataTable.js delete mode 100644 client/src/containers/Sales/Receipt/ReceiptsViewPage.js delete mode 100644 client/src/containers/Sales/Receipt/withReceiptActions.js delete mode 100644 client/src/containers/Sales/Receipt/withReceiptDetail.js delete mode 100644 client/src/containers/Sales/Receipt/withReceipts.js rename client/src/containers/Sales/{Receipt => Receipts/ReceiptForm}/ReceiptForm.js (100%) rename client/src/containers/Sales/{Receipt => Receipts/ReceiptForm}/ReceiptForm.schema.js (100%) rename client/src/containers/Sales/{Receipt => Receipts/ReceiptForm}/ReceiptFormBody.js (100%) rename client/src/containers/Sales/{Receipt => Receipts/ReceiptForm}/ReceiptFormFloatingActions.js (100%) rename client/src/containers/Sales/{Receipt => Receipts/ReceiptForm}/ReceiptFormFooter.js (100%) rename client/src/containers/Sales/{Receipt => Receipts/ReceiptForm}/ReceiptFormHeader.js (100%) rename client/src/containers/Sales/{Receipt => Receipts/ReceiptForm}/ReceiptFormHeaderFields.js (100%) rename client/src/containers/Sales/{Receipt => Receipts/ReceiptForm}/ReceiptFormPage.js (100%) rename client/src/containers/Sales/{Receipt => Receipts/ReceiptForm}/ReceiptFormProvider.js (100%) rename client/src/containers/Sales/{Receipt => Receipts/ReceiptForm}/ReceiptNumberWatcher.js (100%) rename client/src/containers/Sales/{Receipt => Receipts}/ReceiptsAlerts.js (100%) rename client/src/containers/Sales/{Receipt => Receipts/ReceiptsLanding}/ReceiptActionsBar.js (88%) rename client/src/containers/Sales/{Receipt => Receipts/ReceiptsLanding}/ReceiptViewTabs.js (54%) rename client/src/containers/Sales/{Receipt => Receipts/ReceiptsLanding}/ReceiptsEmptyStatus.js (100%) rename client/src/containers/Sales/{Receipt => Receipts/ReceiptsLanding}/ReceiptsList.js (62%) rename client/src/containers/Sales/{Receipt => Receipts/ReceiptsLanding}/ReceiptsListProvider.js (72%) create mode 100644 client/src/containers/Sales/Receipts/ReceiptsLanding/ReceiptsTable.js create mode 100644 client/src/containers/Sales/Receipts/ReceiptsLanding/components.js create mode 100644 client/src/containers/Sales/Receipts/ReceiptsLanding/withReceipts.js create mode 100644 client/src/containers/Sales/Receipts/ReceiptsLanding/withReceiptsActions.js delete mode 100644 client/src/store/PaymentMades/paymentMade.actions.js delete mode 100644 client/src/store/PaymentMades/paymentMade.reducer.js delete mode 100644 client/src/store/PaymentMades/paymentMade.selector.js delete mode 100644 client/src/store/PaymentMades/paymentMade.type.js create mode 100644 client/src/store/PaymentMades/paymentMades.actions.js create mode 100644 client/src/store/PaymentMades/paymentMades.reducer.js create mode 100644 client/src/store/PaymentMades/paymentMades.selector.js create mode 100644 client/src/store/PaymentMades/paymentMades.type.js delete mode 100644 client/src/store/PaymentReceive/paymentReceive.actions.js delete mode 100644 client/src/store/PaymentReceive/paymentReceive.reducer.js delete mode 100644 client/src/store/PaymentReceive/paymentReceive.selector.js delete mode 100644 client/src/store/PaymentReceive/paymentReceive.type.js create mode 100644 client/src/store/PaymentReceives/paymentReceives.actions.js create mode 100644 client/src/store/PaymentReceives/paymentReceives.reducer.js create mode 100644 client/src/store/PaymentReceives/paymentReceives.selector.js create mode 100644 client/src/store/PaymentReceives/paymentReceives.type.js delete mode 100644 client/src/store/receipt/receipt.actions.js delete mode 100644 client/src/store/receipt/receipt.reducer.js delete mode 100644 client/src/store/receipt/receipt.selector.js delete mode 100644 client/src/store/receipt/receipt.type.js create mode 100644 client/src/store/receipts/receipts.actions.js create mode 100644 client/src/store/receipts/receipts.reducer.js create mode 100644 client/src/store/receipts/receipts.selector.js create mode 100644 client/src/store/receipts/receipts.type.js create mode 100644 client/src/style/pages/Expense/List.scss diff --git a/client/src/containers/Alerts/AccountActivateAlert.js b/client/src/containers/Alerts/AccountActivateAlert.js index fd6dbe2f0..777af9dfa 100644 --- a/client/src/containers/Alerts/AccountActivateAlert.js +++ b/client/src/containers/Alerts/AccountActivateAlert.js @@ -8,6 +8,7 @@ import withAlertActions from 'containers/Alert/withAlertActions'; import { useActivateAccount } from 'hooks/query'; import { compose } from 'utils'; + /** * Account activate alert. */ diff --git a/client/src/containers/Alerts/AccountBulkActivateAlert.js b/client/src/containers/Alerts/AccountBulkActivateAlert.js index 3cb367b67..da2672003 100644 --- a/client/src/containers/Alerts/AccountBulkActivateAlert.js +++ b/client/src/containers/Alerts/AccountBulkActivateAlert.js @@ -1,9 +1,5 @@ import React, { useState } from 'react'; -import { - FormattedMessage as T, - FormattedHTMLMessage, - useIntl, -} from 'react-intl'; +import { FormattedMessage as T, useIntl } from 'react-intl'; import { Intent, Alert } from '@blueprintjs/core'; import { queryCache } from 'react-query'; import { AppToaster } from 'components'; diff --git a/client/src/containers/Alerts/AccountBulkDeleteAlert.js b/client/src/containers/Alerts/AccountBulkDeleteAlert.js index 663d1858e..dd18667a1 100644 --- a/client/src/containers/Alerts/AccountBulkDeleteAlert.js +++ b/client/src/containers/Alerts/AccountBulkDeleteAlert.js @@ -12,6 +12,9 @@ import withAlertActions from 'containers/Alert/withAlertActions'; import { compose } from 'utils'; +/** + * Account bulk delete alert. + */ function AccountBulkDeleteAlert({ // #ownProps name, diff --git a/client/src/containers/Alerts/AccountDeleteAlert.js b/client/src/containers/Alerts/AccountDeleteAlert.js index ddfbcf0e3..15014af68 100644 --- a/client/src/containers/Alerts/AccountDeleteAlert.js +++ b/client/src/containers/Alerts/AccountDeleteAlert.js @@ -13,7 +13,6 @@ import withAlertStoreConnect from 'containers/Alert/withAlertStoreConnect'; import withAlertActions from 'containers/Alert/withAlertActions'; import { useDeleteAccount } from 'hooks/query'; - import { compose } from 'utils'; /** @@ -48,12 +47,7 @@ function AccountDeleteAlert({ }); closeAlert(name); }) - .catch((error) => { - const { - response: { - data: { errors }, - }, - } = error; + .catch(({ response: { data: { errors } } }) => { handleDeleteErrors(errors); closeAlert(name); }); diff --git a/client/src/containers/Alerts/Bills/BillDeleteAlert.js b/client/src/containers/Alerts/Bills/BillDeleteAlert.js index 348c0e736..05c0076bf 100644 --- a/client/src/containers/Alerts/Bills/BillDeleteAlert.js +++ b/client/src/containers/Alerts/Bills/BillDeleteAlert.js @@ -10,7 +10,6 @@ import withAlertStoreConnect from 'containers/Alert/withAlertStoreConnect'; import withAlertActions from 'containers/Alert/withAlertActions'; import { useDeleteBill } from 'hooks/query'; - import { compose } from 'utils'; /** @@ -29,12 +28,12 @@ function BillDeleteAlert({ const { formatMessage } = useIntl(); const { isLoading, mutateAsync: deleteBillMutate } = useDeleteBill(); - // handle cancel Bill + // Handle cancel Bill const handleCancel = () => { closeAlert(name); }; - // handleConfirm delete invoice + // Handle confirm delete invoice const handleConfirmBillDelete = () => { deleteBillMutate(billId).then(() => { AppToaster.show({ diff --git a/client/src/containers/Alerts/Bills/BillOpenAlert.js b/client/src/containers/Alerts/Bills/BillOpenAlert.js index 828f75703..0093b4bb7 100644 --- a/client/src/containers/Alerts/Bills/BillOpenAlert.js +++ b/client/src/containers/Alerts/Bills/BillOpenAlert.js @@ -40,8 +40,9 @@ function BillOpenAlert({ }), intent: Intent.SUCCESS, }); + closeAlert(name); }) - .finally((error) => { + .catch((error) => { closeAlert(name); }); }; diff --git a/client/src/containers/Alerts/Estimates/EstimateDeleteAlert.js b/client/src/containers/Alerts/Estimates/EstimateDeleteAlert.js index b07c2833c..491a97ce9 100644 --- a/client/src/containers/Alerts/Estimates/EstimateDeleteAlert.js +++ b/client/src/containers/Alerts/Estimates/EstimateDeleteAlert.js @@ -1,4 +1,4 @@ -import React, { useCallback, useState } from 'react'; +import React, { useCallback } from 'react'; import { FormattedMessage as T, FormattedHTMLMessage, diff --git a/client/src/containers/Alerts/Estimates/EstimateRejectAlert.js b/client/src/containers/Alerts/Estimates/EstimateRejectAlert.js index a56ee3bd1..2a013ede2 100644 --- a/client/src/containers/Alerts/Estimates/EstimateRejectAlert.js +++ b/client/src/containers/Alerts/Estimates/EstimateRejectAlert.js @@ -1,14 +1,12 @@ -import React, { useCallback } from 'react'; +import React from 'react'; import { FormattedMessage as T, useIntl } from 'react-intl'; import { Intent, Alert } from '@blueprintjs/core'; -import { queryCache } from 'react-query'; import { AppToaster } from 'components'; import { useRejectEstimate } from 'hooks/query'; import withAlertStoreConnect from 'containers/Alert/withAlertStoreConnect'; import withAlertActions from 'containers/Alert/withAlertActions'; -import withEstimateActions from 'containers/Sales/Estimate/withEstimateActions'; import { compose } from 'utils'; @@ -22,9 +20,6 @@ function EstimateRejectAlert({ isOpen, payload: { estimateId }, - // #withEstimateActions - requestRejectEstimate, - // #withAlertActions closeAlert, }) { @@ -40,8 +35,8 @@ function EstimateRejectAlert({ }; // Handle confirm estimate reject. - const handleConfirmEstimateReject = useCallback(() => { - requestRejectEstimate(estimateId) + const handleConfirmEstimateReject = () => { + rejectEstimateMutate(estimateId) .then(() => { AppToaster.show({ message: formatMessage({ @@ -49,13 +44,12 @@ function EstimateRejectAlert({ }), intent: Intent.SUCCESS, }); - queryCache.invalidateQueries('estimates-table'); }) .catch((error) => {}) .finally(() => { closeAlert(name); }); - }, [estimateId, rejectEstimateMutate, formatMessage]); + }; return ( { closeAlert(name); }; @@ -84,5 +78,4 @@ function InvoiceDeleteAlert({ export default compose( withAlertStoreConnect(), withAlertActions, - withInvoiceActions, )(InvoiceDeleteAlert); diff --git a/client/src/containers/Alerts/Invoices/InvoiceDeliverAlert.js b/client/src/containers/Alerts/Invoices/InvoiceDeliverAlert.js index 96cc5c5f3..5badf9335 100644 --- a/client/src/containers/Alerts/Invoices/InvoiceDeliverAlert.js +++ b/client/src/containers/Alerts/Invoices/InvoiceDeliverAlert.js @@ -7,7 +7,6 @@ import { AppToaster } from 'components'; import withAlertStoreConnect from 'containers/Alert/withAlertStoreConnect'; import withAlertActions from 'containers/Alert/withAlertActions'; -import withInvoiceActions from 'containers/Sales/Invoice/withInvoiceActions'; import { compose } from 'utils'; @@ -72,5 +71,4 @@ function InvoiceDeliverAlert({ export default compose( withAlertStoreConnect(), withAlertActions, - withInvoiceActions, )(InvoiceDeliverAlert); diff --git a/client/src/containers/Dialogs/EstimateNumberDialog/EstimateNumberDialogContent.js b/client/src/containers/Dialogs/EstimateNumberDialog/EstimateNumberDialogContent.js index fda4a8d68..42a8267a0 100644 --- a/client/src/containers/Dialogs/EstimateNumberDialog/EstimateNumberDialogContent.js +++ b/client/src/containers/Dialogs/EstimateNumberDialog/EstimateNumberDialogContent.js @@ -6,7 +6,6 @@ import ReferenceNumberForm from 'containers/JournalNumber/ReferenceNumberForm'; import withDialogActions from 'containers/Dialog/withDialogActions'; import withSettings from 'containers/Settings/withSettings'; import withSettingsActions from 'containers/Settings/withSettingsActions'; -import withEstimateActions from 'containers/Sales/Estimate/withEstimateActions'; import { compose, optionsMapToArray } from 'utils'; @@ -18,15 +17,13 @@ function EstimateNumberDialogContent({ // #withSettings nextNumber, numberPrefix, + // #withSettingsActions requestFetchOptions, requestSubmitOptions, // #withDialogActions closeDialog, - - // #withEstimateActions - setEstimateNumberChanged, }) { const fetchSettings = useQuery(['settings'], () => requestFetchOptions({})); @@ -41,7 +38,7 @@ function EstimateNumberDialogContent({ setTimeout(() => { queryCache.invalidateQueries('settings'); - setEstimateNumberChanged(true); + // setEstimateNumberChanged(true); }, 250); }) .catch(() => { @@ -72,5 +69,4 @@ export default compose( nextNumber: estimatesSettings?.nextNumber, numberPrefix: estimatesSettings?.numberPrefix, })), - withEstimateActions, )(EstimateNumberDialogContent); diff --git a/client/src/containers/Dialogs/InvoiceNumberDialog/InvoiceNumberDialogContent.js b/client/src/containers/Dialogs/InvoiceNumberDialog/InvoiceNumberDialogContent.js index 33783df40..a9aa09cb5 100644 --- a/client/src/containers/Dialogs/InvoiceNumberDialog/InvoiceNumberDialogContent.js +++ b/client/src/containers/Dialogs/InvoiceNumberDialog/InvoiceNumberDialogContent.js @@ -7,7 +7,7 @@ import ReferenceNumberForm from 'containers/JournalNumber/ReferenceNumberForm'; import withDialogActions from 'containers/Dialog/withDialogActions'; import withSettings from 'containers/Settings/withSettings'; import withSettingsActions from 'containers/Settings/withSettingsActions'; -import withInvoicesActions from 'containers/Sales/Invoice/withInvoiceActions'; +// import withInvoicesActions from 'containers/Sales/Invoice/withInvoiceActions'; import { compose, optionsMapToArray } from 'utils'; @@ -28,7 +28,7 @@ function InvoiceNumberDialogContent({ closeDialog, // #withInvoicesActions - setInvoiceNumberChanged, + // setInvoiceNumberChanged, }) { const fetchSettings = useQuery(['settings'], () => requestFetchOptions({})); @@ -44,7 +44,7 @@ function InvoiceNumberDialogContent({ setTimeout(() => { queryCache.invalidateQueries('settings'); - setInvoiceNumberChanged(true); + // setInvoiceNumberChanged(true); }, 250); }) .catch(() => { @@ -75,5 +75,5 @@ export default compose( nextNumber: invoiceSettings?.nextNumber, numberPrefix: invoiceSettings?.numberPrefix, })), - withInvoicesActions, + // withInvoicesActions, )(InvoiceNumberDialogContent); diff --git a/client/src/containers/Dialogs/PaymentReceiveNumberDialog/PaymentReceiveNumberDialogContent.js b/client/src/containers/Dialogs/PaymentReceiveNumberDialog/PaymentReceiveNumberDialogContent.js index 302b08cad..b0fa75c2e 100644 --- a/client/src/containers/Dialogs/PaymentReceiveNumberDialog/PaymentReceiveNumberDialogContent.js +++ b/client/src/containers/Dialogs/PaymentReceiveNumberDialog/PaymentReceiveNumberDialogContent.js @@ -1,13 +1,13 @@ import React, { useCallback } from 'react'; import { DialogContent } from 'components'; -import { useQuery, queryCache } from 'react-query'; +import { useQuery } from 'react-query'; import ReferenceNumberForm from 'containers/JournalNumber/ReferenceNumberForm'; import withDialogActions from 'containers/Dialog/withDialogActions'; import withSettingsActions from 'containers/Settings/withSettingsActions'; import withSettings from 'containers/Settings/withSettings'; -import withPaymentReceivesActions from 'containers/Sales/PaymentReceive/withPaymentReceivesActions'; +// import withPaymentReceivesActions from 'containers/Sales/PaymentReceive/withPaymentReceivesActions'; import { compose, optionsMapToArray } from 'utils'; @@ -28,7 +28,7 @@ function PaymentNumberDialogContent({ closeDialog, // #withPaymentReceivesActions - setPaymentReceiveNumberChanged, + // setPaymentReceiveNumberChanged, }) { const fetchSettings = useQuery(['settings'], () => requestFetchOptions({})); @@ -43,8 +43,7 @@ function PaymentNumberDialogContent({ closeDialog('payment-receive-number-form'); setTimeout(() => { - queryCache.invalidateQueries('settings'); - setPaymentReceiveNumberChanged(true); + // setPaymentReceiveNumberChanged(true); }, 250); }) .catch(() => { @@ -76,5 +75,5 @@ export default compose( nextNumber: paymentReceiveSettings?.nextNumber, numberPrefix: paymentReceiveSettings?.numberPrefix, })), - withPaymentReceivesActions, + // withPaymentReceivesActions, )(PaymentNumberDialogContent); diff --git a/client/src/containers/Dialogs/ReceiptNumberDialog/ReceiptNumberDialogContent.js b/client/src/containers/Dialogs/ReceiptNumberDialog/ReceiptNumberDialogContent.js index 39eee1f0d..76c9100ce 100644 --- a/client/src/containers/Dialogs/ReceiptNumberDialog/ReceiptNumberDialogContent.js +++ b/client/src/containers/Dialogs/ReceiptNumberDialog/ReceiptNumberDialogContent.js @@ -1,13 +1,12 @@ import React, { useCallback } from 'react'; import { DialogContent } from 'components'; -import { useQuery, queryCache } from 'react-query'; +import { useQuery } from 'react-query'; import ReferenceNumberForm from 'containers/JournalNumber/ReferenceNumberForm'; import withDialogActions from 'containers/Dialog/withDialogActions'; import withSettings from 'containers/Settings/withSettings'; import withSettingsActions from 'containers/Settings/withSettingsActions'; -import withReceiptActions from 'containers/Sales/Receipt/withReceiptActions'; import { compose, optionsMapToArray } from 'utils'; @@ -43,7 +42,6 @@ function ReceiptNumberDialogContent({ closeDialog('receipt-number-form'); setTimeout(() => { - queryCache.invalidateQueries('settings'); setReceiptNumberChanged(true); }, 250); }) @@ -75,5 +73,4 @@ export default compose( nextNumber: receiptSettings?.nextNumber, numberPrefix: receiptSettings?.numberPrefix, })), - withReceiptActions, )(ReceiptNumberDialogContent); diff --git a/client/src/containers/Expenses/ExpensesLanding/ExpensesList.js b/client/src/containers/Expenses/ExpensesLanding/ExpensesList.js index 83ce58a3b..4765654cd 100644 --- a/client/src/containers/Expenses/ExpensesLanding/ExpensesList.js +++ b/client/src/containers/Expenses/ExpensesLanding/ExpensesList.js @@ -1,6 +1,8 @@ import React, { useEffect } from 'react'; - import { useIntl } from 'react-intl'; + +import 'style/pages/Expense/List.scss'; + import DashboardPageContent from 'components/Dashboard/DashboardPageContent'; import ExpenseActionsBar from './ExpenseActionsBar'; diff --git a/client/src/containers/Purchases/Bill/BillsDataTable.js b/client/src/containers/Purchases/Bill/BillsDataTable.js deleted file mode 100644 index e41ae752c..000000000 --- a/client/src/containers/Purchases/Bill/BillsDataTable.js +++ /dev/null @@ -1,296 +0,0 @@ -import React, { useCallback, useMemo } from 'react'; -import { - Intent, - Button, - Popover, - Menu, - MenuItem, - MenuDivider, - Position, - Tag, -} from '@blueprintjs/core'; - -import { withRouter } from 'react-router'; -import { FormattedMessage as T, useIntl } from 'react-intl'; -import moment from 'moment'; -import classNames from 'classnames'; - -import Icon from 'components/Icon'; -import { compose, saveInvoke, isBlank } from 'utils'; -import { CLASSES } from 'common/classes'; -import { useIsValuePassed } from 'hooks'; - -import { LoadingIndicator, Money, Choose, If } from 'components'; -import DataTable from 'components/DataTable'; -import BillsEmptyStatus from './BillsEmptyStatus'; - -import withDialogActions from 'containers/Dialog/withDialogActions'; -import withDashboardActions from 'containers/Dashboard/withDashboardActions'; -import withViewDetails from 'containers/Views/withViewDetails'; - -import withBills from './withBills'; -import withBillActions from './withBillActions'; -import withCurrentView from 'containers/Views/withCurrentView'; -import withSettings from 'containers/Settings/withSettings'; - -// Bills transactions datatable. -function BillsDataTable({ - // #withBills - billsCurrentPage, - billsLoading, - billsPageination, - billsCurrentViewId, - - // #withDashboardActions - changeCurrentView, - changePageSubtitle, - setTopbarEditView, - - // #withBillsActions - addBillsTableQueries, - - // #withView - viewMeta, - - // #withSettings - baseCurrency, - - // #ownProps - loading, - onFetchData, - onEditBill, - onDeleteBill, - onOpenBill, - onSelectedRowsChange, -}) { - const { formatMessage } = useIntl(); - - const handleFetchData = useCallback( - ({ pageIndex, pageSize, sortBy }) => { - const page = pageIndex + 1; - - addBillsTableQueries({ - ...(sortBy.length > 0 - ? { - column_sort_by: sortBy[0].id, - sort_order: sortBy[0].desc ? 'desc' : 'asc', - } - : {}), - page_size: pageSize, - page, - }); - }, - [addBillsTableQueries], - ); - - const handleEditBill = useCallback( - (_bill) => () => { - saveInvoke(onEditBill, _bill); - }, - [onEditBill], - ); - - const handleDeleteBill = useCallback( - (_bill) => () => { - saveInvoke(onDeleteBill, _bill); - }, - [onDeleteBill], - ); - - const actionMenuList = useCallback( - (bill) => ( - - } - text={formatMessage({ id: 'view_details' })} - /> - - } - text={formatMessage({ id: 'edit_bill' })} - onClick={handleEditBill(bill)} - /> - - onOpenBill(bill)} - /> - - - } - /> - - ), - [handleDeleteBill, handleEditBill, formatMessage], - ); - - const onRowContextMenu = useCallback( - (cell) => { - return actionMenuList(cell.row.original); - }, - [actionMenuList], - ); - - const columns = useMemo( - () => [ - { - id: 'bill_date', - Header: formatMessage({ id: 'bill_date' }), - accessor: (r) => moment(r.bill_date).format('YYYY MMM DD'), - width: 140, - className: 'bill_date', - }, - { - id: 'vendor_id', - Header: formatMessage({ id: 'vendor_name' }), - accessor: 'vendor.display_name', - width: 140, - className: 'vendor_id', - }, - { - id: 'bill_number', - Header: formatMessage({ id: 'bill_number' }), - accessor: (row) => (row.bill_number ? `#${row.bill_number}` : null), - width: 140, - className: 'bill_number', - }, - { - id: 'due_date', - Header: formatMessage({ id: 'due_date' }), - accessor: (r) => moment(r.due_date).format('YYYY MMM DD'), - width: 140, - className: 'due_date', - }, - { - id: 'amount', - Header: formatMessage({ id: 'amount' }), - accessor: (row) => - !isBlank(row.amount) ? ( - - ) : ( - '' - ), - width: 140, - className: 'amount', - }, - { - id: 'status', - Header: formatMessage({ id: 'status' }), - accessor: (row) => ( - - - - - - - - - - - - - - ), - width: 140, - className: 'status', - }, - { - id: 'reference_no', - Header: formatMessage({ id: 'reference_no' }), - accessor: 'reference_no', - width: 140, - className: 'reference_no', - }, - { - id: 'actions', - Header: '', - Cell: ({ cell }) => ( - -