From a9560b27f116e4b2b559907de4bd6ae547d4b36f Mon Sep 17 00:00:00 2001 From: Hillel Coren Date: Wed, 26 Jan 2022 13:10:30 +0200 Subject: [PATCH] Working on reversing invoices --- lib/data/models/invoice_model.dart | 2 -- lib/redux/invoice/invoice_actions.dart | 26 ----------------------- lib/redux/invoice/invoice_middleware.dart | 26 ----------------------- lib/redux/invoice/invoice_reducer.dart | 10 --------- windows/runner/main.cpp | 4 ++-- 5 files changed, 2 insertions(+), 66 deletions(-) diff --git a/lib/data/models/invoice_model.dart b/lib/data/models/invoice_model.dart index 22f8549cb..848e8a05e 100644 --- a/lib/data/models/invoice_model.dart +++ b/lib/data/models/invoice_model.dart @@ -961,11 +961,9 @@ abstract class InvoiceEntity extends Object actions.add(EntityAction.cancel); } - /* if (userCompany.canCreate(EntityType.credit)) { actions.add(EntityAction.reverse); } - */ } } diff --git a/lib/redux/invoice/invoice_actions.dart b/lib/redux/invoice/invoice_actions.dart index f615dfcb4..2c244c38d 100644 --- a/lib/redux/invoice/invoice_actions.dart +++ b/lib/redux/invoice/invoice_actions.dart @@ -304,25 +304,6 @@ class MarkInvoicesPaidFailure implements StopSaving { final dynamic error; } -class ReverseInvoicesRequest implements StartSaving { - ReverseInvoicesRequest(this.completer, this.invoiceIds); - - final Completer completer; - final List invoiceIds; -} - -class ReverseInvoicesSuccess implements StopSaving { - ReverseInvoicesSuccess(this.invoices); - - final List invoices; -} - -class ReverseInvoicesFailure implements StopSaving { - ReverseInvoicesFailure(this.error); - - final Object error; -} - class CancelInvoicesRequest implements StartSaving { CancelInvoicesRequest(this.completer, this.invoiceIds); @@ -549,13 +530,6 @@ void handleInvoiceAction(BuildContext context, List invoices, invoiceIds)); break; case EntityAction.reverse: - store.dispatch(ReverseInvoicesRequest( - snackBarCompleter( - context, - invoiceIds.length == 1 - ? localization.reversedInvoice - : localization.reversedInvoices), - invoiceIds)); break; case EntityAction.cancel: store.dispatch(CancelInvoicesRequest( diff --git a/lib/redux/invoice/invoice_middleware.dart b/lib/redux/invoice/invoice_middleware.dart index 8df9519bb..197a6425a 100644 --- a/lib/redux/invoice/invoice_middleware.dart +++ b/lib/redux/invoice/invoice_middleware.dart @@ -38,7 +38,6 @@ List> createStoreInvoicesMiddleware([ final bulkEmailInvoices = _bulkEmailInvoices(repository); final markInvoiceSent = _markInvoiceSent(repository); final markInvoicePaid = _markInvoicePaid(repository); - final reverseInvoices = _reverseInvoices(repository); final cancelInvoices = _cancelInvoices(repository); final downloadInvoices = _downloadInvoices(repository); final saveDocument = _saveDocument(repository); @@ -59,7 +58,6 @@ List> createStoreInvoicesMiddleware([ TypedMiddleware(bulkEmailInvoices), TypedMiddleware(markInvoiceSent), TypedMiddleware(markInvoicePaid), - TypedMiddleware(reverseInvoices), TypedMiddleware(cancelInvoices), TypedMiddleware(downloadInvoices), TypedMiddleware(saveDocument), @@ -173,30 +171,6 @@ Middleware _cancelInvoices(InvoiceRepository repository) { }; } -Middleware _reverseInvoices(InvoiceRepository repository) { - return (Store store, dynamic dynamicAction, NextDispatcher next) { - final action = dynamicAction as ReverseInvoicesRequest; - repository - .bulkAction( - store.state.credentials, action.invoiceIds, EntityAction.reverse) - .then((List invoices) { - store.dispatch(ReverseInvoicesSuccess(invoices)); - store.dispatch(RefreshData()); - if (action.completer != null) { - action.completer.complete(null); - } - }).catchError((Object error) { - print(error); - store.dispatch(ReverseInvoicesFailure(error)); - if (action.completer != null) { - action.completer.completeError(error); - } - }); - - next(action); - }; -} - Middleware _archiveInvoice(InvoiceRepository repository) { return (Store store, dynamic dynamicAction, NextDispatcher next) { final action = dynamicAction as ArchiveInvoicesRequest; diff --git a/lib/redux/invoice/invoice_reducer.dart b/lib/redux/invoice/invoice_reducer.dart index 8e2ea50d1..e0f2248e7 100644 --- a/lib/redux/invoice/invoice_reducer.dart +++ b/lib/redux/invoice/invoice_reducer.dart @@ -312,7 +312,6 @@ final invoicesReducer = combineReducers([ TypedReducer(_updateInvoice), TypedReducer(_markInvoicesSentSuccess), TypedReducer(_markInvoicesPaidSuccess), - TypedReducer(_reverseInvoicesSuccess), TypedReducer(_cancelInvoicesSuccess), TypedReducer(_emailInvoiceSuccess), TypedReducer(_archiveInvoiceSuccess), @@ -338,15 +337,6 @@ InvoiceState _markInvoicesPaidSuccess( }); } -InvoiceState _reverseInvoicesSuccess( - InvoiceState invoiceState, ReverseInvoicesSuccess action) { - return invoiceState.rebuild((b) { - for (final invoice in action.invoices) { - b.map[invoice.id] = invoice; - } - }); -} - InvoiceState _cancelInvoicesSuccess( InvoiceState invoiceState, CancelInvoicesSuccess action) { return invoiceState.rebuild((b) { diff --git a/windows/runner/main.cpp b/windows/runner/main.cpp index 99cfa6453..54ca92a44 100644 --- a/windows/runner/main.cpp +++ b/windows/runner/main.cpp @@ -1,5 +1,5 @@ -#include -auto bdw = bitsdojo_window_configure(BDW_CUSTOM_FRAME | BDW_HIDE_ON_STARTUP); +//#include +//auto bdw = bitsdojo_window_configure(BDW_CUSTOM_FRAME | BDW_HIDE_ON_STARTUP); #include #include