Sultan
/
invoice
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Merge branch 'develop'

This commit is contained in:
Hillel Coren 2024-01-23 15:44:27 +02:00
parent 2528564f8c a51fbf3746
commit b6da033a43
9 changed files with 44 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/flatpak.yml vendored
View File

@ -86,7 +86,7 @@ jobs:
draft: false draft: false
prerelease: false prerelease: false
title: "Latest Release" title: "Latest Release"
automatic_release_tag: "v5.0.150" automatic_release_tag: "v5.0.151"
files: | files: |
${{ github.workspace }}/artifacts/Invoice-Ninja-Archive ${{ github.workspace }}/artifacts/Invoice-Ninja-Archive
${{ github.workspace }}/artifacts/Invoice-Ninja-Hash ${{ github.workspace }}/artifacts/Invoice-Ninja-Hash

1
flatpak/com.invoiceninja.InvoiceNinja.metainfo.xml
View File

@ -50,6 +50,7 @@
</screenshots> </screenshots>
<content_rating type="oars-1.1"/> <content_rating type="oars-1.1"/>
<releases> <releases>
<release version="5.0.151" date="2024-01-23"/>
<release version="5.0.150" date="2024-01-18"/> <release version="5.0.150" date="2024-01-18"/>
<release version="5.0.149" date="2024-01-12"/> <release version="5.0.149" date="2024-01-12"/>
<release version="5.0.148" date="2024-01-08"/> <release version="5.0.148" date="2024-01-08"/>

2
lib/constants.dart
View File

@ -6,7 +6,7 @@ class Constants {
} }
// TODO remove version once #46609 is fixed // 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 kMinServerVersion = '5.0.4';
const String kAppName = 'Invoice Ninja'; const String kAppName = 'Invoice Ninja';

33
lib/ui/reports/reports_screen.dart
View File

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

4
lib/ui/schedule/edit/schedule_edit.dart
View File

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

30
lib/ui/settings/import_export.dart
View File

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

2
pubspec.foss.yaml
View File

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

2
pubspec.yaml
View File

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

2
snap/snapcraft.yaml
View File

@ -1,5 +1,5 @@
name: invoiceninja name: invoiceninja
version: '5.0.150' version: '5.0.151'
summary: Create invoices, accept payments, track expenses & time tasks 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 description: "### Note: if the app fails to run using `snap run invoiceninja` it may help to run `/snap/invoiceninja/current/bin/invoiceninja` instead