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 Feb 14, 2023
2 parents a2a1748 + bac920c commit e7431d4
Show file tree
Hide file tree
Showing 10 changed files with 119 additions and 23 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 @@ -380,15 +380,15 @@
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development";
CURRENT_PROJECT_VERSION = 106;
CURRENT_PROJECT_VERSION = 107;
DEVELOPMENT_TEAM = NPC44Y2C98;
ENABLE_BITCODE = NO;
INFOPLIST_FILE = Runner/Info.plist;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 5.0.106;
MARKETING_VERSION = 5.0.107;
PRODUCT_BUNDLE_IDENTIFIER = com.invoiceninja.app;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
Expand Down Expand Up @@ -512,15 +512,15 @@
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development";
CURRENT_PROJECT_VERSION = 106;
CURRENT_PROJECT_VERSION = 107;
DEVELOPMENT_TEAM = NPC44Y2C98;
ENABLE_BITCODE = NO;
INFOPLIST_FILE = Runner/Info.plist;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 5.0.106;
MARKETING_VERSION = 5.0.107;
PRODUCT_BUNDLE_IDENTIFIER = com.invoiceninja.app;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
Expand All @@ -538,15 +538,15 @@
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development";
CURRENT_PROJECT_VERSION = 106;
CURRENT_PROJECT_VERSION = 107;
DEVELOPMENT_TEAM = NPC44Y2C98;
ENABLE_BITCODE = NO;
INFOPLIST_FILE = Runner/Info.plist;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 5.0.106;
MARKETING_VERSION = 5.0.107;
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.106';
const String kClientVersion = '5.0.107';
const String kMinServerVersion = '5.0.4';

const String kAppName = 'Invoice Ninja';
Expand Down
64 changes: 64 additions & 0 deletions lib/data/models/webhook_model.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -104,39 +104,103 @@ abstract class WebhookEntity extends Object
static const EVENT_DELETE_CREDIT = '29';
static const EVENT_DELETE_PROJECT = '30';
static const EVENT_UPDATE_PAYMENT = '31';
static const EVENT_ARCHIVE_PAYMENT = '32';
static const EVENT_ARCHIVE_INVOICE = '33';
static const EVENT_ARCHIVE_QUOTE = '34';
static const EVENT_ARCHIVE_CREDIT = '35';
static const EVENT_ARCHIVE_TASK = '36';
static const EVENT_ARCHIVE_CLIENT = '37';
static const EVENT_ARCHIVE_PROJECT = '38';
static const EVENT_ARCHIVE_EXPENSE = '39';
static const EVENT_RESTORE_PAYMENT = '40';
static const EVENT_RESTORE_INVOICE = '41';
static const EVENT_RESTORE_QUOTE = '42';
static const EVENT_RESTORE_CREDIT = '43';
static const EVENT_RESTORE_TASK = '44';
static const EVENT_RESTORE_CLIENT = '45';
static const EVENT_RESTORE_PROJECT = '46';
static const EVENT_RESTORE_EXPENSE = '47';
static const EVENT_ARCHIVE_VENDOR = '48';
static const EVENT_RESTORE_VENDOR = '49';
static const EVENT_CREATE_PRODUCT = '50';
static const EVENT_UPDATE_PRODUCT = '51';
static const EVENT_DELETE_PRODUCT = '52';
static const EVENT_RESTORE_PRODUCT = '53';
static const EVENT_ARCHIVE_PRODUCT = '54';
static const EVENT_CREATE_PURCHASE_ORDER = '55';
static const EVENT_UPDATE_PURCHASE_ORDER = '56';
static const EVENT_DELETE_PURCHASE_ORDER = '57';
static const EVENT_RESTORE_PURCHASE_ORDER = '58';
static const EVENT_ARCHIVE_PURCHASE_ORDER = '59';
static const EVENT_SENT_INVOICE = '60';
static const EVENT_SENT_QUOTE = '61';
static const EVENT_SENT_CREDIT = '62';
static const EVENT_SENT_PURCHASE_ORDER = '63';

static const EVENT_MAP = {
EVENT_CREATE_CLIENT: 'create_client',
EVENT_UPDATE_CLIENT: 'update_client',
EVENT_ARCHIVE_CLIENT: 'archive_client',
EVENT_RESTORE_CLIENT: 'restore_client',
EVENT_DELETE_CLIENT: 'delete_client',
EVENT_CREATE_INVOICE: 'create_invoice',
EVENT_SENT_INVOICE: 'sent_invoice',
EVENT_UPDATE_INVOICE: 'update_invoice',
EVENT_LATE_INVOICE: 'late_invoice',
EVENT_REMIND_INVOICE: 'remind_invoice',
EVENT_ARCHIVE_INVOICE: 'archive_invoice',
EVENT_RESTORE_INVOICE: 'restore_invoice',
EVENT_DELETE_INVOICE: 'delete_invoice',
EVENT_CREATE_QUOTE: 'create_quote',
EVENT_SENT_QUOTE: 'sent_quote',
EVENT_UPDATE_QUOTE: 'update_quote',
EVENT_APPROVE_QUOTE: 'approve_quote',
EVENT_EXPIRED_QUOTE: 'expired_quote',
EVENT_ARCHIVE_QUOTE: 'archive_quote',
EVENT_RESTORE_QUOTE: 'restore_quote',
EVENT_DELETE_QUOTE: 'delete_quote',
EVENT_CREATE_CREDIT: 'create_credit',
EVENT_SENT_CREDIT: 'sent_credit',
EVENT_UPDATE_CREDIT: 'update_credit',
EVENT_ARCHIVE_CREDIT: 'archive_credit',
EVENT_RESTORE_CREDIT: 'restore_credit',
EVENT_DELETE_CREDIT: 'delete_credit',
EVENT_CREATE_PAYMENT: 'create_payment',
EVENT_UPDATE_PAYMENT: 'update_payment',
EVENT_ARCHIVE_PAYMENT: 'archive_payment',
EVENT_RESTORE_PAYMENT: 'restore_payment',
EVENT_DELETE_PAYMENT: 'delete_payment',
EVENT_CREATE_VENDOR: 'create_vendor',
EVENT_UPDATE_VENDOR: 'update_vendor',
EVENT_ARCHIVE_VENDOR: 'archive_vendor',
EVENT_RESTORE_VENDOR: 'restore_vendor',
EVENT_DELETE_VENDOR: 'delete_vendor',
EVENT_CREATE_EXPENSE: 'create_expense',
EVENT_UPDATE_EXPENSE: 'update_expense',
EVENT_ARCHIVE_EXPENSE: 'archive_expense',
EVENT_RESTORE_EXPENSE: 'restore_expense',
EVENT_DELETE_EXPENSE: 'delete_expense',
EVENT_CREATE_TASK: 'create_task',
EVENT_UPDATE_TASK: 'update_task',
EVENT_ARCHIVE_TASK: 'archive_task',
EVENT_RESTORE_TASK: 'restore_task',
EVENT_DELETE_TASK: 'delete_task',
EVENT_CREATE_PROJECT: 'create_project',
EVENT_UPDATE_PROJECT: 'update_project',
EVENT_ARCHIVE_PROJECT: 'archive_project',
EVENT_RESTORE_PROJECT: 'restore_project',
EVENT_DELETE_PROJECT: 'delete_project',
EVENT_CREATE_PRODUCT: 'create_product',
EVENT_UPDATE_PRODUCT: 'update_product',
EVENT_DELETE_PRODUCT: 'delete_product',
EVENT_RESTORE_PRODUCT: 'restore_product',
EVENT_ARCHIVE_PRODUCT: 'archive_product',
EVENT_CREATE_PURCHASE_ORDER: 'create_purchase_order',
EVENT_SENT_PURCHASE_ORDER: 'sent_purchase_order',
EVENT_UPDATE_PURCHASE_ORDER: 'update_purchase_order',
EVENT_DELETE_PURCHASE_ORDER: 'delete_purchase_order',
EVENT_RESTORE_PURCHASE_ORDER: 'restore_purchase_order',
EVENT_ARCHIVE_PURCHASE_ORDER: 'archive_purchase_order',
};

@override
Expand Down
12 changes: 6 additions & 6 deletions lib/ui/app/menu_drawer.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1136,12 +1136,12 @@ class SidebarFooter extends StatelessWidget {
},
tooltip: prefState.enableTooltips ? localization.userGuide : '',
),
IconButton(
icon: Icon(Icons.info_outline),
// prevent the modal from being stuck over the pdf
onPressed: () => _showAbout(context),
tooltip: prefState.enableTooltips ? localization.about : '',
),
if (state.userCompany.isAdmin)
IconButton(
icon: Icon(Icons.info_outline),
onPressed: () => _showAbout(context),
tooltip: prefState.enableTooltips ? localization.about : '',
),
/*
if (kDebugMode)
IconButton(
Expand Down
32 changes: 32 additions & 0 deletions lib/utils/i18n.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,38 @@ mixin LocalizationsProvider on LocaleCodeAware {
static final Map<String, Map<String, String>> _localizedValues = {
'en': {
// STARTER: lang key - do not remove comment
'archive_payment': 'Archive Payment',
'archive_invoice': 'Archive Invoice',
'archive_quote': 'Archive Quote',
'archive_credit': 'Archive Credit',
'archive_task': 'Archive Task',
'archive_client': 'Archive Client',
'archive_project': 'Archive Project',
'archive_expense': 'Archive Expense',
'restore_payment': 'Restore Payment',
'restore_invoice': 'Restore Invoice',
'restore_quote': 'Restore Quote',
'restore_credit': 'Restore Credit',
'restore_task': 'Restore Task',
'restore_client': 'Restore Client',
'restore_project': 'Restore Project',
'restore_expense': 'Restore Expense',
'archive_vendor': 'Archive Vendor',
'restore_vendor': 'Restore Vendor',
'create_product': 'Create Product',
'update_product': 'Update Product',
'delete_product': 'Delete Product',
'restore_product': 'Restore Product',
'archive_product': 'Archive Product',
'create_purchase_order': 'Create Purchase Order',
'update_purchase_order': 'Update Purchase Order',
'delete_purchase_order': 'Delete Purchase Order',
'restore_purchase_order': 'Restore Purchase Order',
'archive_purchase_order': 'Archive Purchase Order',
'sent_invoice': 'Sent Invoice',
'sent_quote': 'Sent Quote',
'sent_credit': 'Sent Credit',
'sent_purchase_order': 'Sent Purchase Order',
'image_url': 'Image URL',
'max_quantity': 'Max Quantity',
'test_url': 'Test URL',
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 @@ -421,15 +421,15 @@
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
COMBINE_HIDPI_IMAGES = YES;
CURRENT_PROJECT_VERSION = 106;
CURRENT_PROJECT_VERSION = 107;
DEVELOPMENT_TEAM = NPC44Y2C98;
INFOPLIST_FILE = Runner/Info.plist;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/../Frameworks",
);
MACOSX_DEPLOYMENT_TARGET = 10.15;
MARKETING_VERSION = 5.0.106;
MARKETING_VERSION = 5.0.107;
PROVISIONING_PROFILE_SPECIFIER = "";
SWIFT_VERSION = 5.0;
};
Expand Down Expand Up @@ -552,15 +552,15 @@
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
COMBINE_HIDPI_IMAGES = YES;
CURRENT_PROJECT_VERSION = 106;
CURRENT_PROJECT_VERSION = 107;
DEVELOPMENT_TEAM = NPC44Y2C98;
INFOPLIST_FILE = Runner/Info.plist;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/../Frameworks",
);
MACOSX_DEPLOYMENT_TARGET = 10.15;
MARKETING_VERSION = 5.0.106;
MARKETING_VERSION = 5.0.107;
PROVISIONING_PROFILE_SPECIFIER = "";
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_VERSION = 5.0;
Expand All @@ -577,15 +577,15 @@
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
COMBINE_HIDPI_IMAGES = YES;
CURRENT_PROJECT_VERSION = 106;
CURRENT_PROJECT_VERSION = 107;
DEVELOPMENT_TEAM = NPC44Y2C98;
INFOPLIST_FILE = Runner/Info.plist;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/../Frameworks",
);
MACOSX_DEPLOYMENT_TARGET = 10.15;
MARKETING_VERSION = 5.0.106;
MARKETING_VERSION = 5.0.107;
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.106+106
version: 5.0.107+107
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.106+106
version: 5.0.107+107
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.106+106
version: 5.0.107+107
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.106'
version: '5.0.107'
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 e7431d4

Please sign in to comment.