Merge branch 'develop'

invoiceninja · May 19, 2024 · 7b74d1b · 7b74d1b
2 parents 9b3ab7a + 0a33858
commit 7b74d1b
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 13 deletions.
diff --git a/lib/data/models/settings_model.dart b/lib/data/models/settings_model.dart
@@ -843,8 +843,9 @@ abstract class SettingsEntity
       taskRoundToNearest == null ? null : taskRoundToNearest != 1;
 
   bool get isTaskRoundingCustom =>
-      taskRoundToNearest == 0 ||
-      !kTaskRoundingOptions.values.contains(taskRoundToNearest);
+      taskRoundingEnabled == true &&
+      (taskRoundToNearest == 0 ||
+          !kTaskRoundingOptions.values.contains(taskRoundToNearest));
 
   bool get hasAddress => address1 != null && address1!.isNotEmpty;
 

diff --git a/lib/ui/product/view/product_view_overview.dart b/lib/ui/product/view/product_view_overview.dart
@@ -110,10 +110,6 @@ class _ProductOverviewState extends State<ProductOverview> {
           formatNumberType: FormatNumberType.int);
     }
 
-    if (product.imageUrl.isNotEmpty) {
-      fields[localization.imageUrl] = product.imageUrl;
-    }
-
     return ScrollableListView(
       children: <Widget>[
         EntityHeader(
@@ -127,13 +123,24 @@ class _ProductOverviewState extends State<ProductOverview> {
         ),
         ListDivider(),
         FieldGrid(fields),
-        Padding(
-          padding: EdgeInsets.all(20),
-          child: Text(
-            product.notes,
-            style: TextStyle(fontSize: 16),
+        if (product.notes.isNotEmpty)
+          Padding(
+            padding: EdgeInsets.only(left: 20, top: 20, right: 20),
+            child: Text(
+              product.notes,
+              style: TextStyle(fontSize: 16),
+            ),
           ),
-        ),
+        if (product.imageUrl.isNotEmpty)
+          Padding(
+            padding: EdgeInsets.only(left: 20, top: 20, right: 20),
+            child: Image.network(
+              product.imageUrl,
+              width: double.infinity,
+              fit: BoxFit.contain,
+            ),
+          ),
+        SizedBox(height: 20),
       ],
     );
   }

diff --git a/lib/ui/settings/task_settings.dart b/lib/ui/settings/task_settings.dart
@@ -161,7 +161,7 @@ class _TaskSettingsState extends State<TaskSettings> {
                       viewModel.onSettingsChanged(settings.rebuild(
                     (b) => b
                       ..taskRoundToNearest = value == true
-                          ? 60 * 5
+                          ? 60 * 15
                           : value == false
                               ? 1
                               : null,