From 8d08df504d3ce218e597f26db0c8ca14af16c816 Mon Sep 17 00:00:00 2001 From: Hillel Coren Date: Tue, 19 Jan 2021 17:11:37 +0200 Subject: [PATCH] Update models --- lib/data/models/expense_model.dart | 4 ---- lib/data/models/models.dart | 2 -- lib/data/models/task_model.dart | 4 ---- lib/redux/credit/credit_actions.dart | 7 ------- lib/redux/expense/expense_actions.dart | 6 ------ lib/redux/quote/quote_actions.dart | 6 ------ lib/redux/task/task_actions.dart | 6 ------ lib/ui/expense/view/expense_view.dart | 2 +- lib/ui/task/view/task_view.dart | 2 +- lib/utils/icons.dart | 2 -- 10 files changed, 2 insertions(+), 39 deletions(-) diff --git a/lib/data/models/expense_model.dart b/lib/data/models/expense_model.dart index 3c9aef2db..6f02c7f86 100644 --- a/lib/data/models/expense_model.dart +++ b/lib/data/models/expense_model.dart @@ -294,10 +294,6 @@ abstract class ExpenseEntity extends Object } } - if (isInvoiced && !multiselect) { - actions.add(EntityAction.viewInvoice); - } - if (userCompany.canCreate(EntityType.task) && !multiselect) { actions.add(EntityAction.clone); } diff --git a/lib/data/models/models.dart b/lib/data/models/models.dart index bd2ad70ab..2f3f3a2fc 100644 --- a/lib/data/models/models.dart +++ b/lib/data/models/models.dart @@ -70,8 +70,6 @@ class EntityAction extends EnumClass { static const EntityAction newExpense = _$newExpense; static const EntityAction newProject = _$newProject; static const EntityAction newTask = _$newTask; - static const EntityAction viewInvoice = _$viewInvoice; - static const EntityAction viewQuote = _$viewQuote; static const EntityAction clientPortal = _$clientPortal; static const EntityAction newPayment = _$newPayment; static const EntityAction settings = _$settings; diff --git a/lib/data/models/task_model.dart b/lib/data/models/task_model.dart index e796f8a4e..48b7ca3f8 100644 --- a/lib/data/models/task_model.dart +++ b/lib/data/models/task_model.dart @@ -516,10 +516,6 @@ abstract class TaskEntity extends Object } if (!multiselect) { - if (isInvoiced) { - actions.add(EntityAction.viewInvoice); - } - if (userCompany.canCreate(EntityType.task)) { actions.add(EntityAction.clone); } diff --git a/lib/redux/credit/credit_actions.dart b/lib/redux/credit/credit_actions.dart index e39bdfec2..3eba0c534 100644 --- a/lib/redux/credit/credit_actions.dart +++ b/lib/redux/credit/credit_actions.dart @@ -424,13 +424,6 @@ Future handleCreditAction( forceSafariVC: false, forceWebView: false); } break; - case EntityAction.viewInvoice: - viewEntityById( - context: context, - // TODO fix this - // entityId: credit.creditInvoiceId, - entityType: EntityType.invoice); - break; case EntityAction.markSent: store.dispatch(MarkSentCreditRequest( snackBarCompleter(context, localization.markedCreditAsSent), diff --git a/lib/redux/expense/expense_actions.dart b/lib/redux/expense/expense_actions.dart index 32ad4b1da..d98a03573 100644 --- a/lib/redux/expense/expense_actions.dart +++ b/lib/redux/expense/expense_actions.dart @@ -288,12 +288,6 @@ void handleExpenseAction( ..lineItems.addAll(items))); } break; - case EntityAction.viewInvoice: - viewEntityById( - context: context, - entityType: EntityType.invoice, - entityId: expense.invoiceId); - break; case EntityAction.restore: final message = expenseIds.length > 1 ? localization.restoredExpenses diff --git a/lib/redux/quote/quote_actions.dart b/lib/redux/quote/quote_actions.dart index 1d143e570..2c5dec0e0 100644 --- a/lib/redux/quote/quote_actions.dart +++ b/lib/redux/quote/quote_actions.dart @@ -443,12 +443,6 @@ Future handleQuoteAction( forceSafariVC: false, forceWebView: false); } break; - case EntityAction.viewInvoice: - viewEntityById( - context: context, - entityId: quote.invoiceId, - entityType: EntityType.invoice); - break; case EntityAction.convert: store.dispatch(ConvertQuotes( snackBarCompleter(context, localization.convertedQuote), diff --git a/lib/redux/task/task_actions.dart b/lib/redux/task/task_actions.dart index 685b93345..886620fad 100644 --- a/lib/redux/task/task_actions.dart +++ b/lib/redux/task/task_actions.dart @@ -337,12 +337,6 @@ void handleTaskAction( ..lineItems.addAll(items))); } break; - case EntityAction.viewInvoice: - viewEntityById( - context: context, - entityType: EntityType.invoice, - entityId: task.invoiceId); - break; case EntityAction.clone: createEntity(context: context, entity: task.clone); break; diff --git a/lib/ui/expense/view/expense_view.dart b/lib/ui/expense/view/expense_view.dart index d7282992b..4c7826cc0 100644 --- a/lib/ui/expense/view/expense_view.dart +++ b/lib/ui/expense/view/expense_view.dart @@ -90,7 +90,7 @@ class _ExpenseViewState extends State entity: expense, action1: EntityAction.clone, action2: expense.isInvoiced - ? EntityAction.viewInvoice + ? EntityAction.archive : EntityAction.newInvoice, ) ], diff --git a/lib/ui/task/view/task_view.dart b/lib/ui/task/view/task_view.dart index 733672f80..f891336c1 100644 --- a/lib/ui/task/view/task_view.dart +++ b/lib/ui/task/view/task_view.dart @@ -94,7 +94,7 @@ class _TaskViewState extends State ? EntityAction.start : EntityAction.resume, action2: task.isInvoiced - ? EntityAction.viewInvoice + ? EntityAction.archive : EntityAction.newInvoice, action1Enabled: !task.isInvoiced, ), diff --git a/lib/utils/icons.dart b/lib/utils/icons.dart index 031a507b2..bf89c17e4 100644 --- a/lib/utils/icons.dart +++ b/lib/utils/icons.dart @@ -39,8 +39,6 @@ IconData getEntityActionIcon(EntityAction entityAction) { return Icons.content_copy; case EntityAction.approve: return Icons.check_circle_outline; - case EntityAction.viewInvoice: - return Icons.insert_drive_file; case EntityAction.newInvoice: case EntityAction.newExpense: case EntityAction.newTask: