Merge branch 'develop'

invoiceninja · Jan 30, 2022 · 3dd2229 · 3dd2229
2 parents 9855e3f + 82ec286
commit 3dd2229
Show file tree

Hide file tree

Showing 17 changed files with 497 additions and 442 deletions.
diff --git a/lib/data/models/client_model.dart b/lib/data/models/client_model.dart
@@ -549,8 +549,26 @@ abstract class ClientEntity extends Object
     return response;
   }
 
-  bool matchesName(String filter) =>
-      displayName.toLowerCase().contains(filter.toLowerCase());
+  bool matchesNameOrEmail(String filter) {
+    filter = filter.toLowerCase();
+
+    if (name.toLowerCase().contains(filter)) {
+      return true;
+    }
+
+    for (var i = 0; i < contacts.length; i++) {
+      final contact = contacts[i];
+      if (contact.fullName.toLowerCase().contains(filter)) {
+        return true;
+      }
+
+      if (contact.email.toLowerCase().contains(filter)) {
+        return true;
+      }
+    }
+
+    return false;
+  }
 
   @override
   bool matchesFilter(String filter) {

diff --git a/lib/data/models/vendor_model.dart b/lib/data/models/vendor_model.dart
@@ -331,8 +331,26 @@ abstract class VendorEntity extends Object
     return response;
   }
 
-  bool matchesName(String filter) =>
-      name.toLowerCase().contains(filter.toLowerCase());
+  bool matchesNameOrEmail(String filter) {
+    filter = filter.toLowerCase();
+
+    if (name.toLowerCase().contains(filter)) {
+      return true;
+    }
+
+    for (var i = 0; i < contacts.length; i++) {
+      final contact = contacts[i];
+      if (contact.fullName.toLowerCase().contains(filter)) {
+        return true;
+      }
+
+      if (contact.email.toLowerCase().contains(filter)) {
+        return true;
+      }
+    }
+
+    return false;
+  }
 
   @override
   bool matchesFilter(String filter) {

diff --git a/lib/redux/app/app_state.dart b/lib/redux/app/app_state.dart
@@ -772,8 +772,9 @@ abstract class AppState implements Built<AppState, AppStateBuilder> {
 
   //bool get isEnterprisePlan => isSelfHosted || account.plan == kPlanEnterprise;
 
-  bool get isPaidAccount =>
-      isSelfHosted ? isWhiteLabeled : (isProPlan || isEnterprisePlan);
+  bool get isPaidAccount => isSelfHosted
+      ? isWhiteLabeled
+      : ((isProPlan || isEnterprisePlan) && !isTrial);
 
   bool get isUserConfirmed {
     if (isSelfHosted) {

diff --git a/lib/redux/credit/credit_selectors.dart b/lib/redux/credit/credit_selectors.dart
@@ -116,7 +116,7 @@ List<String> filteredCreditsSelector(
       return false;
     }
     if (!credit.matchesFilter(creditListState.filter) &&
-        !client.matchesName(creditListState.filter)) {
+        !client.matchesNameOrEmail(creditListState.filter)) {
       return false;
     }
 

diff --git a/lib/redux/expense/expense_selectors.dart b/lib/redux/expense/expense_selectors.dart
@@ -196,8 +196,8 @@ List<String> filteredExpensesSelector(
 
     return expense.matchesFilter(expenseListState.filter) ||
         expenseCategory.matchesFilter(expenseListState.filter) ||
-        client.matchesName(expenseListState.filter) ||
-        vendor.matchesName(expenseListState.filter);
+        client.matchesNameOrEmail(expenseListState.filter) ||
+        vendor.matchesNameOrEmail(expenseListState.filter);
   }).toList();
 
   list.sort((expenseAId, expenseBId) {

diff --git a/lib/redux/invoice/invoice_selectors.dart b/lib/redux/invoice/invoice_selectors.dart
@@ -170,7 +170,7 @@ List<String> filteredInvoicesSelector(
       return false;
     }
     if (!invoice.matchesFilter(invoiceListState.filter) &&
-        !client.matchesName(invoiceListState.filter)) {
+        !client.matchesNameOrEmail(invoiceListState.filter)) {
       return false;
     }
     if (invoiceListState.custom1Filters.isNotEmpty &&

diff --git a/lib/redux/payment/payment_selectors.dart b/lib/redux/payment/payment_selectors.dart
@@ -140,7 +140,7 @@ List<String> filteredPaymentsSelector(
     }
 
     if (!payment.matchesFilter(paymentListState.filter) &&
-        !client.matchesName(paymentListState.filter)) {
+        !client.matchesNameOrEmail(paymentListState.filter)) {
       return false;
     }
 

diff --git a/lib/redux/project/project_selectors.dart b/lib/redux/project/project_selectors.dart
@@ -174,7 +174,7 @@ List<String> filteredProjectsSelector(
     }
 
     if (!project.matchesFilter(projectListState.filter) &&
-        !client.matchesName(projectListState.filter)) {
+        !client.matchesNameOrEmail(projectListState.filter)) {
       return false;
     }
 

diff --git a/lib/redux/quote/quote_selectors.dart b/lib/redux/quote/quote_selectors.dart
@@ -67,7 +67,7 @@ List<String> filteredQuotesSelector(
     } else if (!quote.matchesStatuses(quoteListState.statusFilters)) {
       return false;
     } else if (!quote.matchesFilter(quoteListState.filter) &&
-        !client.matchesName(quoteListState.filter)) {
+        !client.matchesNameOrEmail(quoteListState.filter)) {
       return false;
     }
 

diff --git a/lib/redux/recurring_expense/recurring_expense_selectors.dart b/lib/redux/recurring_expense/recurring_expense_selectors.dart
@@ -166,8 +166,8 @@ List<String> filteredRecurringExpensesSelector(
 
     return expense.matchesFilter(expenseListState.filter) ||
         expenseCategory.matchesFilter(expenseListState.filter) ||
-        client.matchesName(expenseListState.filter) ||
-        vendor.matchesName(expenseListState.filter);
+        client.matchesNameOrEmail(expenseListState.filter) ||
+        vendor.matchesNameOrEmail(expenseListState.filter);
   }).toList();
 
   list.sort((expenseAId, expenseBId) {

diff --git a/lib/redux/recurring_invoice/recurring_invoice_selectors.dart b/lib/redux/recurring_invoice/recurring_invoice_selectors.dart
@@ -72,7 +72,7 @@ List<String> filteredRecurringInvoicesSelector(
       return false;
     }
     if (!invoice.matchesFilter(invoiceListState.filter) &&
-        !client.matchesName(invoiceListState.filter)) {
+        !client.matchesNameOrEmail(invoiceListState.filter)) {
       return false;
     }
     if (invoiceListState.custom1Filters.isNotEmpty &&

diff --git a/lib/redux/task/task_selectors.dart b/lib/redux/task/task_selectors.dart
@@ -273,7 +273,7 @@ List<String> filteredTasksSelector(
     }
 
     if (!task.matchesFilter(taskListState.filter) &&
-        !client.matchesName(taskListState.filter) &&
+        !client.matchesNameOrEmail(taskListState.filter) &&
         !project.matchesName(taskListState.filter)) {
       return false;
     }

diff --git a/lib/ui/app/menu_drawer.dart b/lib/ui/app/menu_drawer.dart
@@ -654,16 +654,16 @@ class _DrawerTileState extends State<DrawerTile> {
               color: textColor,
             ),
           ),
-          title: Text(
-            widget.title,
-            key: ValueKey('menu_${widget.title}'),
-            overflow: TextOverflow.clip,
-            maxLines: 1,
-            style: Theme.of(context).textTheme.bodyText1.copyWith(
-                  fontSize: 14,
-                  color: textColor,
+          title: state.isMenuCollapsed
+              ? SizedBox()
+              : Text(
+                  widget.title,
+                  key: ValueKey('menu_${widget.title}'),
+                  style: Theme.of(context).textTheme.bodyText1.copyWith(
+                        fontSize: 14,
+                        color: textColor,
+                      ),
                 ),
-          ),
           onTap: () {
             if (widget.entityType != null) {
               viewEntitiesByType(
@@ -825,9 +825,7 @@ class SidebarFooter extends StatelessWidget {
                 ),
             if (isHosted(context) && !isPaidAccount(context) && !isApple())
               IconButton(
-                tooltip: isHosted(context)
-                    ? localization.upgrade
-                    : localization.purchaseLicense,
+                tooltip: localization.upgrade,
                 icon: Icon(Icons.arrow_circle_up),
                 color: Colors.green,
                 onPressed: () async {

diff --git a/lib/ui/app/menu_drawer_vm.dart b/lib/ui/app/menu_drawer_vm.dart
@@ -122,6 +122,16 @@ class MenuDrawerVM {
             });
       },
       onAddCompany: (BuildContext context) {
+        if (state.isHosted &&
+            !state.isPaidAccount &&
+            state.companies.length >= state.account.hostedCompanyCount) {
+          showMessageDialog(
+            context: context,
+            message: AppLocalization.of(context).requiresAPaidPlan,
+          );
+          return;
+        }
+
         confirmCallback(
             context: context,
             message: AppLocalization.of(context).addCompany,