From 51aefbce6f841e237236ca9334f54f91b5fe24a0 Mon Sep 17 00:00:00 2001 From: Hillel Coren Date: Tue, 3 Aug 2021 22:31:53 +0300 Subject: [PATCH] Full width expense editor --- lib/data/models/entities.dart | 4 ++-- lib/ui/client/view/client_view_overview.dart | 20 ++++++++++---------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/lib/data/models/entities.dart b/lib/data/models/entities.dart index ae04c06b3..3d611c19e 100644 --- a/lib/data/models/entities.dart +++ b/lib/data/models/entities.dart @@ -87,12 +87,12 @@ class EntityType extends EnumClass { case EntityType.client: return [ EntityType.invoice, + EntityType.task, + EntityType.expense, EntityType.payment, EntityType.quote, EntityType.credit, - EntityType.task, EntityType.project, - EntityType.expense, EntityType.recurringInvoice, ]; case EntityType.invoice: diff --git a/lib/ui/client/view/client_view_overview.dart b/lib/ui/client/view/client_view_overview.dart index 4edd1bdf9..b538700a2 100644 --- a/lib/ui/client/view/client_view_overview.dart +++ b/lib/ui/client/view/client_view_overview.dart @@ -206,16 +206,6 @@ class ClientOverview extends StatelessWidget { client.id, state.paymentState.map, state.invoiceState.map) .present(localization.active, localization.archived), ), - if (company.isModuleEnabled(EntityType.recurringInvoice)) - EntitiesListTile( - entity: client, - isFilter: isFilter, - entityType: EntityType.recurringInvoice, - title: localization.recurringInvoices, - subtitle: memoizedRecurringInvoiceStatsForClient( - client.id, state.recurringInvoiceState.map) - .present(localization.active, localization.archived), - ), if (company.isModuleEnabled(EntityType.quote)) EntitiesListTile( entity: client, @@ -246,6 +236,16 @@ class ClientOverview extends StatelessWidget { memoizedProjectStatsForClient(client.id, state.projectState.map) .present(localization.active, localization.archived), ), + if (company.isModuleEnabled(EntityType.recurringInvoice)) + EntitiesListTile( + entity: client, + isFilter: isFilter, + entityType: EntityType.recurringInvoice, + title: localization.recurringInvoices, + subtitle: memoizedRecurringInvoiceStatsForClient( + client.id, state.recurringInvoiceState.map) + .present(localization.active, localization.archived), + ), if ((client.publicNotes ?? '').isNotEmpty) ...[ IconMessage(client.publicNotes), ListDivider()