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

Merge branch 'develop' of github.com:invoiceninja/flutter-client into develop

This commit is contained in:
Hillel Coren 2023-06-20 12:49:30 +03:00
parent e332078dea dffabbbd8e
commit 6019cb9e65
7 changed files with 39 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/constants.dart
View File

@ -4,7 +4,7 @@ class Constants {
} }
// TODO remove version once #46609 is fixed // TODO remove version once #46609 is fixed
const String kClientVersion = '5.0.120'; const String kClientVersion = '5.0.121';
const String kMinServerVersion = '5.0.4'; const String kMinServerVersion = '5.0.4';
const String kAppName = 'Invoice Ninja'; const String kAppName = 'Invoice Ninja';

4
lib/data/repositories/credit_repository.dart
View File

@ -93,7 +93,9 @@ class CreditRepository {
'${credentials.url}/credits/${credit.id}?include=activities.history'; '${credentials.url}/credits/${credit.id}?include=activities.history';
} }
if (action == EntityAction.markSent) { if (action == EntityAction.markPaid) {
url += '&mark_paid=true';
} else if (action == EntityAction.markSent) {
url += '&mark_sent=true'; url += '&mark_sent=true';
} }

3
lib/ui/app/menu_drawer.dart
View File

@ -1150,7 +1150,6 @@ class SidebarFooter extends StatelessWidget {
}, },
tooltip: prefState.enableTooltips ? localization.userGuide : '', tooltip: prefState.enableTooltips ? localization.userGuide : '',
), ),
if (state.userCompany.isAdmin)
IconButton( IconButton(
icon: Icon(Icons.info_outline), icon: Icon(Icons.info_outline),
onPressed: () => _showAbout(context), onPressed: () => _showAbout(context),
@ -1566,6 +1565,7 @@ void _showAbout(BuildContext context) async {
color: Colors.cyan, color: Colors.cyan,
onPressed: () => launchUrl(Uri.parse(kReleaseNotesUrl)), onPressed: () => launchUrl(Uri.parse(kReleaseNotesUrl)),
), ),
if (state.userCompany.isAdmin) ...[
if (state.isSelfHosted || !kReleaseMode) ...[ if (state.isSelfHosted || !kReleaseMode) ...[
AppButton( AppButton(
label: localization.healthCheck.toUpperCase(), label: localization.healthCheck.toUpperCase(),
@ -1591,6 +1591,7 @@ void _showAbout(BuildContext context) async {
onPressed: () => _showUpdate(context), onPressed: () => _showUpdate(context),
), ),
], ],
],
if (state.company.daysActive > 30) if (state.company.daysActive > 30)
AppButton( AppButton(
label: localization.reviewApp.toUpperCase(), label: localization.reviewApp.toUpperCase(),

7
lib/ui/reports/reports_screen_vm.dart
View File

@ -676,13 +676,10 @@ GroupTotals calculateReportTotals({
cell.currencyId != company.currencyId && cell.currencyId != company.currencyId &&
shouldConverCurrencies) { shouldConverCurrencies) {
double cellValue = cell.value; double cellValue = cell.value;
var rate = cell.exchangeRate; final toCurrency = currencyMap[company.currencyId];
if (rate == null || rate == 0 || rate == 1) { final rate = getExchangeRate(currencyMap,
rate = getExchangeRate(currencyMap,
fromCurrencyId: cell.currencyId, fromCurrencyId: cell.currencyId,
toCurrencyId: company.currencyId); toCurrencyId: company.currencyId);
}
final toCurrency = currencyMap[company.currencyId];
cellValue = round(cellValue * rate, toCurrency.precision); cellValue = round(cellValue * rate, toCurrency.precision);
totals[group][column] += cellValue; totals[group][column] += cellValue;
} else { } else {

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.120+120 version: 5.0.121+121
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.120+120 version: 5.0.121+121
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.120' version: '5.0.121'
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