Merge branch 'develop'

invoiceninja · Jan 23, 2024 · b6da033 · b6da033
2 parents 2528564 + a51fbf3
commit b6da033
Show file tree

Hide file tree

Showing 9 changed files with 44 additions and 34 deletions.
diff --git a/.github/workflows/flatpak.yml b/.github/workflows/flatpak.yml
@@ -86,7 +86,7 @@ jobs:
           draft: false
           prerelease: false
           title: "Latest Release"
-          automatic_release_tag: "v5.0.150"
+          automatic_release_tag: "v5.0.151"
           files: |
             ${{ github.workspace }}/artifacts/Invoice-Ninja-Archive
             ${{ github.workspace }}/artifacts/Invoice-Ninja-Hash

diff --git a/flatpak/com.invoiceninja.InvoiceNinja.metainfo.xml b/flatpak/com.invoiceninja.InvoiceNinja.metainfo.xml
@@ -50,6 +50,7 @@
   </screenshots>
   <content_rating type="oars-1.1"/>
   <releases>
+    <release version="5.0.151" date="2024-01-23"/>
     <release version="5.0.150" date="2024-01-18"/>
     <release version="5.0.149" date="2024-01-12"/>
     <release version="5.0.148" date="2024-01-08"/>

diff --git a/lib/constants.dart b/lib/constants.dart
@@ -6,7 +6,7 @@ class Constants {
 }
 
 // TODO remove version once #46609 is fixed
-const String kClientVersion = '5.0.150';
+const String kClientVersion = '5.0.151';
 const String kMinServerVersion = '5.0.4';
 
 const String kAppName = 'Invoice Ninja';

diff --git a/lib/ui/reports/reports_screen.dart b/lib/ui/reports/reports_screen.dart
@@ -385,13 +385,14 @@ class ReportsScreen extends StatelessWidget {
                         viewModel.onExportPressed(context);
                       },
                     ),
-                    AppTextButton(
-                      label: localization.schedule,
-                      isInHeader: true,
-                      onPressed: () {
-                        viewModel.onSchedulePressed(context);
-                      },
-                    ),
+                    if (supportsLatestFeatures('5.8.0'))
+                      AppTextButton(
+                        label: localization.schedule,
+                        isInHeader: true,
+                        onPressed: () {
+                          viewModel.onSchedulePressed(context);
+                        },
+                      ),
                   ],
                   Padding(
                     padding: const EdgeInsets.only(right: 8),
@@ -545,15 +546,17 @@ class ReportsScreen extends StatelessWidget {
                               },
                             ),
                           ),
-                          SizedBox(width: kGutterWidth),
-                          Expanded(
-                            child: AppButton(
-                              label: localization.schedule,
-                              onPressed: () {
-                                viewModel.onSchedulePressed(context);
-                              },
+                          if (supportsLatestFeatures('5.8.0')) ...[
+                            SizedBox(width: kGutterWidth),
+                            Expanded(
+                              child: AppButton(
+                                label: localization.schedule,
+                                onPressed: () {
+                                  viewModel.onSchedulePressed(context);
+                                },
+                              ),
                             ),
-                          ),
+                          ],
                         ],
                       ),
                     ),

diff --git a/lib/ui/schedule/edit/schedule_edit.dart b/lib/ui/schedule/edit/schedule_edit.dart
@@ -19,6 +19,7 @@ import 'package:invoiceninja_flutter/ui/schedule/edit/schedule_edit_vm.dart';
 import 'package:invoiceninja_flutter/utils/localization.dart';
 import 'package:invoiceninja_flutter/utils/completers.dart';
 import 'package:invoiceninja_flutter/ui/app/scrollable_listview.dart';
+import 'package:invoiceninja_flutter/utils/platforms.dart';
 import 'package:invoiceninja_flutter/utils/strings.dart';
 
 class ScheduleEdit extends StatefulWidget {
@@ -163,6 +164,9 @@ class _ScheduleEditState extends State<ScheduleEdit> {
                           );
                         },
                         items: ScheduleEntity.TEMPLATES
+                            .where((entry) =>
+                                supportsLatestFeatures('5.8.0') ||
+                                entry != ScheduleEntity.TEMPLATE_EMAIL_REPORT)
                             .map((entry) => DropdownMenuItem(
                                   value: entry,
                                   child: Text(localization.lookup(entry)),

diff --git a/lib/ui/settings/import_export.dart b/lib/ui/settings/import_export.dart
@@ -356,20 +356,22 @@ class _ImportExportState extends State<ImportExport> {
                           },
                         ),
                       ),
-                      SizedBox(width: kGutterWidth),
-                      Expanded(
-                          child: AppButton(
-                        label: localization.schedule,
-                        iconData: Icons.schedule,
-                        onPressed: () {
-                          createEntity(
-                              entity: ScheduleEntity(
-                                      ScheduleEntity.TEMPLATE_EMAIL_REPORT)
-                                  .rebuild((b) => b
-                                    ..parameters.reportName =
-                                        _exportType.name));
-                        },
-                      ))
+                      if (supportsLatestFeatures('5.8.0')) ...[
+                        SizedBox(width: kGutterWidth),
+                        Expanded(
+                            child: AppButton(
+                          label: localization.schedule,
+                          iconData: Icons.schedule,
+                          onPressed: () {
+                            createEntity(
+                                entity: ScheduleEntity(
+                                        ScheduleEntity.TEMPLATE_EMAIL_REPORT)
+                                    .rebuild((b) => b
+                                      ..parameters.reportName =
+                                          _exportType.name));
+                          },
+                        ))
+                      ],
                     ],
                   )
                 ],

diff --git a/pubspec.foss.yaml b/pubspec.foss.yaml
@@ -1,6 +1,6 @@
 name: invoiceninja_flutter
 description: Client for Invoice Ninja
-version: 5.0.150+150
+version: 5.0.151+151
 homepage: https://invoiceninja.com
 documentation: https://invoiceninja.github.io
 publish_to: none

diff --git a/pubspec.yaml b/pubspec.yaml
@@ -1,6 +1,6 @@
 name: invoiceninja_flutter
 description: Client for Invoice Ninja
-version: 5.0.150+150
+version: 5.0.151+151
 homepage: https://invoiceninja.com
 documentation: https://invoiceninja.github.io
 publish_to: none

diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
@@ -1,5 +1,5 @@
 name: invoiceninja
-version: '5.0.150'
+version: '5.0.151'
 summary: Create invoices, accept payments, track expenses & time tasks
 description: "### Note: if the app fails to run using `snap run invoiceninja` it may help to run `/snap/invoiceninja/current/bin/invoiceninja` instead