Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
@hillelcoren
hillelcoren committed Jul 8, 2022
2 parents ac9dba5 + 047ee8f commit 8218d57
Show file tree
Hide file tree
Showing 11 changed files with 31 additions and 32 deletions.
12 changes: 6 additions & 6 deletions ios/Runner.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -372,15 +372,15 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES;
CURRENT_PROJECT_VERSION = 87;
CURRENT_PROJECT_VERSION = 88;
DEVELOPMENT_TEAM = NPC44Y2C98;
ENABLE_BITCODE = NO;
INFOPLIST_FILE = Runner/Info.plist;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 5.0.87;
MARKETING_VERSION = 5.0.88;
PRODUCT_BUNDLE_IDENTIFIER = com.invoiceninja.app;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
Expand Down Expand Up @@ -502,15 +502,15 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES;
CURRENT_PROJECT_VERSION = 87;
CURRENT_PROJECT_VERSION = 88;
DEVELOPMENT_TEAM = NPC44Y2C98;
ENABLE_BITCODE = NO;
INFOPLIST_FILE = Runner/Info.plist;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 5.0.87;
MARKETING_VERSION = 5.0.88;
PRODUCT_BUNDLE_IDENTIFIER = com.invoiceninja.app;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
Expand All @@ -526,15 +526,15 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES;
CURRENT_PROJECT_VERSION = 87;
CURRENT_PROJECT_VERSION = 88;
DEVELOPMENT_TEAM = NPC44Y2C98;
ENABLE_BITCODE = NO;
INFOPLIST_FILE = Runner/Info.plist;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 5.0.87;
MARKETING_VERSION = 5.0.88;
PRODUCT_BUNDLE_IDENTIFIER = com.invoiceninja.app;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
Expand Down
2 changes: 1 addition & 1 deletion lib/constants.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ class Constants {
}

// TODO remove version once #46609 is fixed
const String kClientVersion = '5.0.87';
const String kClientVersion = '5.0.88';
const String kMinServerVersion = '5.0.4';

const String kAppName = 'Invoice Ninja';
Expand Down
6 changes: 2 additions & 4 deletions lib/data/models/models.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -145,11 +145,9 @@ class EntityAction extends EnumClass {
String toApiParam() {
final value = toString();

if (value.endsWith('email')) {
if (this == EntityAction.sendEmail || this == EntityAction.bulkSendEmail) {
return 'email';
}

if (this == EntityAction.cancelInvoice) {
} else if (this == EntityAction.cancelInvoice) {
return 'cancel';
} else if (this == EntityAction.convertToExpense) {
return 'expense';
Expand Down
4 changes: 2 additions & 2 deletions lib/ui/app/edit_scaffold.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -124,15 +124,15 @@ class EditScaffold extends StatelessWidget {
child: Scaffold(
body: state.companies.isEmpty
? LoadingIndicator()
: showUpgradeBanner
: showUpgradeBanner && !isApple()
? Column(
children: [
InkWell(
child: IconMessage(
upgradeMessage,
color: Colors.orange,
),
onTap: state.userCompany.isOwner && !isApple()
onTap: state.userCompany.isOwner
? () async {
launch(state.userCompany.ninjaPortalUrl);
}
Expand Down
15 changes: 8 additions & 7 deletions lib/ui/app/menu_drawer.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -527,13 +527,14 @@ class MenuDrawer extends StatelessWidget {
icon: getEntityIcon(EntityType.recurringExpense),
title: localization.recurringExpenses,
),
DrawerTile(
company: company,
icon: getEntityIcon(EntityType.reports),
title: localization.reports,
onTap: () => viewEntitiesByType(
entityType: EntityType.reports),
),
if (!isApple() || state.isProPlan)
DrawerTile(
company: company,
icon: getEntityIcon(EntityType.reports),
title: localization.reports,
onTap: () => viewEntitiesByType(
entityType: EntityType.reports),
),
DrawerTile(
company: company,
icon: getEntityIcon(EntityType.settings),
Expand Down
4 changes: 2 additions & 2 deletions lib/ui/app/review_app.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ class _ReviewAppState extends State<ReviewApp> {
child: ConstrainedBox(
constraints: const BoxConstraints(minWidth: 100),
child: Padding(
padding: const EdgeInsets.symmetric(vertical: 8),
padding: const EdgeInsets.symmetric(vertical: 16),
child: Text(
_likesTheApp == null
? localization.yesItsGreat
Expand All @@ -102,7 +102,7 @@ class _ReviewAppState extends State<ReviewApp> {
child: ConstrainedBox(
constraints: const BoxConstraints(minWidth: 100),
child: Padding(
padding: const EdgeInsets.symmetric(vertical: 8),
padding: const EdgeInsets.symmetric(vertical: 16),
child: Text(
_likesTheApp == null
? localization.notSoMuch
Expand Down
12 changes: 6 additions & 6 deletions macos/Runner.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -420,13 +420,13 @@
CODE_SIGN_ENTITLEMENTS = Runner/DebugProfile.entitlements;
CODE_SIGN_STYLE = Automatic;
COMBINE_HIDPI_IMAGES = YES;
CURRENT_PROJECT_VERSION = 87;
CURRENT_PROJECT_VERSION = 88;
INFOPLIST_FILE = Runner/Info.plist;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/../Frameworks",
);
MARKETING_VERSION = 5.0.87;
MARKETING_VERSION = 5.0.88;
PROVISIONING_PROFILE_SPECIFIER = "";
SWIFT_VERSION = 5.0;
};
Expand Down Expand Up @@ -548,13 +548,13 @@
CODE_SIGN_ENTITLEMENTS = Runner/DebugProfile.entitlements;
CODE_SIGN_STYLE = Automatic;
COMBINE_HIDPI_IMAGES = YES;
CURRENT_PROJECT_VERSION = 87;
CURRENT_PROJECT_VERSION = 88;
INFOPLIST_FILE = Runner/Info.plist;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/../Frameworks",
);
MARKETING_VERSION = 5.0.87;
MARKETING_VERSION = 5.0.88;
PROVISIONING_PROFILE_SPECIFIER = "";
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_VERSION = 5.0;
Expand All @@ -570,13 +570,13 @@
CODE_SIGN_ENTITLEMENTS = Runner/Release.entitlements;
CODE_SIGN_STYLE = Automatic;
COMBINE_HIDPI_IMAGES = YES;
CURRENT_PROJECT_VERSION = 87;
CURRENT_PROJECT_VERSION = 88;
INFOPLIST_FILE = Runner/Info.plist;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/../Frameworks",
);
MARKETING_VERSION = 5.0.87;
MARKETING_VERSION = 5.0.88;
PROVISIONING_PROFILE_SPECIFIER = "";
SWIFT_VERSION = 5.0;
};
Expand Down
2 changes: 1 addition & 1 deletion pubspec.foss.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: invoiceninja_flutter
description: Client for Invoice Ninja
version: 5.0.87+87
version: 5.0.88+88
homepage: https://invoiceninja.com
documentation: https://invoiceninja.github.io
publish_to: none
Expand Down
2 changes: 1 addition & 1 deletion pubspec.next.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: invoiceninja_flutter
description: Client for Invoice Ninja
version: 5.0.87+87
version: 5.0.88+88
homepage: https://invoiceninja.com
documentation: https://invoiceninja.github.io
publish_to: none
Expand Down
2 changes: 1 addition & 1 deletion pubspec.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: invoiceninja_flutter
description: Client for Invoice Ninja
version: 5.0.87+87
version: 5.0.88+88
homepage: https://invoiceninja.com
documentation: https://invoiceninja.github.io
publish_to: none
Expand Down
2 changes: 1 addition & 1 deletion snap/snapcraft.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: invoiceninja
version: '5.0.87'
version: '5.0.88'
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
Expand Down

0 comments on commit 8218d57

Please sign in to comment.