Skip to content

Commit e7431d4

Browse files
hillelcorenhillelcoren
committed
Merge branch 'develop'
2 parents a2a1748 + bac920c commit e7431d4

File tree

10 files changed

+119
-23
lines changed

10 files changed

+119
-23
lines changed

‎ios/Runner.xcodeproj/project.pbxproj

+6-6
Original file line numberDiff line numberDiff line change
@@ -380,15 +380,15 @@
380380
CLANG_ENABLE_MODULES = YES;
381381
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
382382
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development";
383-
CURRENT_PROJECT_VERSION = 106;
383+
CURRENT_PROJECT_VERSION = 107;
384384
DEVELOPMENT_TEAM = NPC44Y2C98;
385385
ENABLE_BITCODE = NO;
386386
INFOPLIST_FILE = Runner/Info.plist;
387387
LD_RUNPATH_SEARCH_PATHS = (
388388
"$(inherited)",
389389
"@executable_path/Frameworks",
390390
);
391-
MARKETING_VERSION = 5.0.106;
391+
MARKETING_VERSION = 5.0.107;
392392
PRODUCT_BUNDLE_IDENTIFIER = com.invoiceninja.app;
393393
PRODUCT_NAME = "$(TARGET_NAME)";
394394
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
@@ -512,15 +512,15 @@
512512
CLANG_ENABLE_MODULES = YES;
513513
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
514514
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development";
515-
CURRENT_PROJECT_VERSION = 106;
515+
CURRENT_PROJECT_VERSION = 107;
516516
DEVELOPMENT_TEAM = NPC44Y2C98;
517517
ENABLE_BITCODE = NO;
518518
INFOPLIST_FILE = Runner/Info.plist;
519519
LD_RUNPATH_SEARCH_PATHS = (
520520
"$(inherited)",
521521
"@executable_path/Frameworks",
522522
);
523-
MARKETING_VERSION = 5.0.106;
523+
MARKETING_VERSION = 5.0.107;
524524
PRODUCT_BUNDLE_IDENTIFIER = com.invoiceninja.app;
525525
PRODUCT_NAME = "$(TARGET_NAME)";
526526
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
@@ -538,15 +538,15 @@
538538
CLANG_ENABLE_MODULES = YES;
539539
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
540540
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development";
541-
CURRENT_PROJECT_VERSION = 106;
541+
CURRENT_PROJECT_VERSION = 107;
542542
DEVELOPMENT_TEAM = NPC44Y2C98;
543543
ENABLE_BITCODE = NO;
544544
INFOPLIST_FILE = Runner/Info.plist;
545545
LD_RUNPATH_SEARCH_PATHS = (
546546
"$(inherited)",
547547
"@executable_path/Frameworks",
548548
);
549-
MARKETING_VERSION = 5.0.106;
549+
MARKETING_VERSION = 5.0.107;
550550
PRODUCT_BUNDLE_IDENTIFIER = com.invoiceninja.app;
551551
PRODUCT_NAME = "$(TARGET_NAME)";
552552
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";

‎lib/constants.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ class Constants {
44
}
55

66
// TODO remove version once #46609 is fixed
7-
const String kClientVersion = '5.0.106';
7+
const String kClientVersion = '5.0.107';
88
const String kMinServerVersion = '5.0.4';
99

1010
const String kAppName = 'Invoice Ninja';

‎lib/data/models/webhook_model.dart

+64
Original file line numberDiff line numberDiff line change
@@ -104,39 +104,103 @@ abstract class WebhookEntity extends Object
104104
static const EVENT_DELETE_CREDIT = '29';
105105
static const EVENT_DELETE_PROJECT = '30';
106106
static const EVENT_UPDATE_PAYMENT = '31';
107+
static const EVENT_ARCHIVE_PAYMENT = '32';
108+
static const EVENT_ARCHIVE_INVOICE = '33';
109+
static const EVENT_ARCHIVE_QUOTE = '34';
110+
static const EVENT_ARCHIVE_CREDIT = '35';
111+
static const EVENT_ARCHIVE_TASK = '36';
112+
static const EVENT_ARCHIVE_CLIENT = '37';
113+
static const EVENT_ARCHIVE_PROJECT = '38';
114+
static const EVENT_ARCHIVE_EXPENSE = '39';
115+
static const EVENT_RESTORE_PAYMENT = '40';
116+
static const EVENT_RESTORE_INVOICE = '41';
117+
static const EVENT_RESTORE_QUOTE = '42';
118+
static const EVENT_RESTORE_CREDIT = '43';
119+
static const EVENT_RESTORE_TASK = '44';
120+
static const EVENT_RESTORE_CLIENT = '45';
121+
static const EVENT_RESTORE_PROJECT = '46';
122+
static const EVENT_RESTORE_EXPENSE = '47';
123+
static const EVENT_ARCHIVE_VENDOR = '48';
124+
static const EVENT_RESTORE_VENDOR = '49';
125+
static const EVENT_CREATE_PRODUCT = '50';
126+
static const EVENT_UPDATE_PRODUCT = '51';
127+
static const EVENT_DELETE_PRODUCT = '52';
128+
static const EVENT_RESTORE_PRODUCT = '53';
129+
static const EVENT_ARCHIVE_PRODUCT = '54';
130+
static const EVENT_CREATE_PURCHASE_ORDER = '55';
131+
static const EVENT_UPDATE_PURCHASE_ORDER = '56';
132+
static const EVENT_DELETE_PURCHASE_ORDER = '57';
133+
static const EVENT_RESTORE_PURCHASE_ORDER = '58';
134+
static const EVENT_ARCHIVE_PURCHASE_ORDER = '59';
135+
static const EVENT_SENT_INVOICE = '60';
136+
static const EVENT_SENT_QUOTE = '61';
137+
static const EVENT_SENT_CREDIT = '62';
138+
static const EVENT_SENT_PURCHASE_ORDER = '63';
107139

108140
static const EVENT_MAP = {
109141
EVENT_CREATE_CLIENT: 'create_client',
110142
EVENT_UPDATE_CLIENT: 'update_client',
143+
EVENT_ARCHIVE_CLIENT: 'archive_client',
144+
EVENT_RESTORE_CLIENT: 'restore_client',
111145
EVENT_DELETE_CLIENT: 'delete_client',
112146
EVENT_CREATE_INVOICE: 'create_invoice',
147+
EVENT_SENT_INVOICE: 'sent_invoice',
113148
EVENT_UPDATE_INVOICE: 'update_invoice',
114149
EVENT_LATE_INVOICE: 'late_invoice',
115150
EVENT_REMIND_INVOICE: 'remind_invoice',
151+
EVENT_ARCHIVE_INVOICE: 'archive_invoice',
152+
EVENT_RESTORE_INVOICE: 'restore_invoice',
116153
EVENT_DELETE_INVOICE: 'delete_invoice',
117154
EVENT_CREATE_QUOTE: 'create_quote',
155+
EVENT_SENT_QUOTE: 'sent_quote',
118156
EVENT_UPDATE_QUOTE: 'update_quote',
119157
EVENT_APPROVE_QUOTE: 'approve_quote',
120158
EVENT_EXPIRED_QUOTE: 'expired_quote',
159+
EVENT_ARCHIVE_QUOTE: 'archive_quote',
160+
EVENT_RESTORE_QUOTE: 'restore_quote',
121161
EVENT_DELETE_QUOTE: 'delete_quote',
122162
EVENT_CREATE_CREDIT: 'create_credit',
163+
EVENT_SENT_CREDIT: 'sent_credit',
123164
EVENT_UPDATE_CREDIT: 'update_credit',
165+
EVENT_ARCHIVE_CREDIT: 'archive_credit',
166+
EVENT_RESTORE_CREDIT: 'restore_credit',
124167
EVENT_DELETE_CREDIT: 'delete_credit',
125168
EVENT_CREATE_PAYMENT: 'create_payment',
126169
EVENT_UPDATE_PAYMENT: 'update_payment',
170+
EVENT_ARCHIVE_PAYMENT: 'archive_payment',
171+
EVENT_RESTORE_PAYMENT: 'restore_payment',
127172
EVENT_DELETE_PAYMENT: 'delete_payment',
128173
EVENT_CREATE_VENDOR: 'create_vendor',
129174
EVENT_UPDATE_VENDOR: 'update_vendor',
175+
EVENT_ARCHIVE_VENDOR: 'archive_vendor',
176+
EVENT_RESTORE_VENDOR: 'restore_vendor',
130177
EVENT_DELETE_VENDOR: 'delete_vendor',
131178
EVENT_CREATE_EXPENSE: 'create_expense',
132179
EVENT_UPDATE_EXPENSE: 'update_expense',
180+
EVENT_ARCHIVE_EXPENSE: 'archive_expense',
181+
EVENT_RESTORE_EXPENSE: 'restore_expense',
133182
EVENT_DELETE_EXPENSE: 'delete_expense',
134183
EVENT_CREATE_TASK: 'create_task',
135184
EVENT_UPDATE_TASK: 'update_task',
185+
EVENT_ARCHIVE_TASK: 'archive_task',
186+
EVENT_RESTORE_TASK: 'restore_task',
136187
EVENT_DELETE_TASK: 'delete_task',
137188
EVENT_CREATE_PROJECT: 'create_project',
138189
EVENT_UPDATE_PROJECT: 'update_project',
190+
EVENT_ARCHIVE_PROJECT: 'archive_project',
191+
EVENT_RESTORE_PROJECT: 'restore_project',
139192
EVENT_DELETE_PROJECT: 'delete_project',
193+
EVENT_CREATE_PRODUCT: 'create_product',
194+
EVENT_UPDATE_PRODUCT: 'update_product',
195+
EVENT_DELETE_PRODUCT: 'delete_product',
196+
EVENT_RESTORE_PRODUCT: 'restore_product',
197+
EVENT_ARCHIVE_PRODUCT: 'archive_product',
198+
EVENT_CREATE_PURCHASE_ORDER: 'create_purchase_order',
199+
EVENT_SENT_PURCHASE_ORDER: 'sent_purchase_order',
200+
EVENT_UPDATE_PURCHASE_ORDER: 'update_purchase_order',
201+
EVENT_DELETE_PURCHASE_ORDER: 'delete_purchase_order',
202+
EVENT_RESTORE_PURCHASE_ORDER: 'restore_purchase_order',
203+
EVENT_ARCHIVE_PURCHASE_ORDER: 'archive_purchase_order',
140204
};
141205

142206
@override

‎lib/ui/app/menu_drawer.dart

+6-6
Original file line numberDiff line numberDiff line change
@@ -1136,12 +1136,12 @@ class SidebarFooter extends StatelessWidget {
11361136
},
11371137
tooltip: prefState.enableTooltips ? localization.userGuide : '',
11381138
),
1139-
IconButton(
1140-
icon: Icon(Icons.info_outline),
1141-
// prevent the modal from being stuck over the pdf
1142-
onPressed: () => _showAbout(context),
1143-
tooltip: prefState.enableTooltips ? localization.about : '',
1144-
),
1139+
if (state.userCompany.isAdmin)
1140+
IconButton(
1141+
icon: Icon(Icons.info_outline),
1142+
onPressed: () => _showAbout(context),
1143+
tooltip: prefState.enableTooltips ? localization.about : '',
1144+
),
11451145
/*
11461146
if (kDebugMode)
11471147
IconButton(

‎lib/utils/i18n.dart

+32
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,38 @@ mixin LocalizationsProvider on LocaleCodeAware {
1616
static final Map<String, Map<String, String>> _localizedValues = {
1717
'en': {
1818
// STARTER: lang key - do not remove comment
19+
'archive_payment': 'Archive Payment',
20+
'archive_invoice': 'Archive Invoice',
21+
'archive_quote': 'Archive Quote',
22+
'archive_credit': 'Archive Credit',
23+
'archive_task': 'Archive Task',
24+
'archive_client': 'Archive Client',
25+
'archive_project': 'Archive Project',
26+
'archive_expense': 'Archive Expense',
27+
'restore_payment': 'Restore Payment',
28+
'restore_invoice': 'Restore Invoice',
29+
'restore_quote': 'Restore Quote',
30+
'restore_credit': 'Restore Credit',
31+
'restore_task': 'Restore Task',
32+
'restore_client': 'Restore Client',
33+
'restore_project': 'Restore Project',
34+
'restore_expense': 'Restore Expense',
35+
'archive_vendor': 'Archive Vendor',
36+
'restore_vendor': 'Restore Vendor',
37+
'create_product': 'Create Product',
38+
'update_product': 'Update Product',
39+
'delete_product': 'Delete Product',
40+
'restore_product': 'Restore Product',
41+
'archive_product': 'Archive Product',
42+
'create_purchase_order': 'Create Purchase Order',
43+
'update_purchase_order': 'Update Purchase Order',
44+
'delete_purchase_order': 'Delete Purchase Order',
45+
'restore_purchase_order': 'Restore Purchase Order',
46+
'archive_purchase_order': 'Archive Purchase Order',
47+
'sent_invoice': 'Sent Invoice',
48+
'sent_quote': 'Sent Quote',
49+
'sent_credit': 'Sent Credit',
50+
'sent_purchase_order': 'Sent Purchase Order',
1951
'image_url': 'Image URL',
2052
'max_quantity': 'Max Quantity',
2153
'test_url': 'Test URL',

‎macos/Runner.xcodeproj/project.pbxproj

+6-6
Original file line numberDiff line numberDiff line change
@@ -421,15 +421,15 @@
421421
CODE_SIGN_IDENTITY = "Apple Development";
422422
CODE_SIGN_STYLE = Automatic;
423423
COMBINE_HIDPI_IMAGES = YES;
424-
CURRENT_PROJECT_VERSION = 106;
424+
CURRENT_PROJECT_VERSION = 107;
425425
DEVELOPMENT_TEAM = NPC44Y2C98;
426426
INFOPLIST_FILE = Runner/Info.plist;
427427
LD_RUNPATH_SEARCH_PATHS = (
428428
"$(inherited)",
429429
"@executable_path/../Frameworks",
430430
);
431431
MACOSX_DEPLOYMENT_TARGET = 10.15;
432-
MARKETING_VERSION = 5.0.106;
432+
MARKETING_VERSION = 5.0.107;
433433
PROVISIONING_PROFILE_SPECIFIER = "";
434434
SWIFT_VERSION = 5.0;
435435
};
@@ -552,15 +552,15 @@
552552
CODE_SIGN_IDENTITY = "Apple Development";
553553
CODE_SIGN_STYLE = Automatic;
554554
COMBINE_HIDPI_IMAGES = YES;
555-
CURRENT_PROJECT_VERSION = 106;
555+
CURRENT_PROJECT_VERSION = 107;
556556
DEVELOPMENT_TEAM = NPC44Y2C98;
557557
INFOPLIST_FILE = Runner/Info.plist;
558558
LD_RUNPATH_SEARCH_PATHS = (
559559
"$(inherited)",
560560
"@executable_path/../Frameworks",
561561
);
562562
MACOSX_DEPLOYMENT_TARGET = 10.15;
563-
MARKETING_VERSION = 5.0.106;
563+
MARKETING_VERSION = 5.0.107;
564564
PROVISIONING_PROFILE_SPECIFIER = "";
565565
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
566566
SWIFT_VERSION = 5.0;
@@ -577,15 +577,15 @@
577577
CODE_SIGN_IDENTITY = "Apple Development";
578578
CODE_SIGN_STYLE = Automatic;
579579
COMBINE_HIDPI_IMAGES = YES;
580-
CURRENT_PROJECT_VERSION = 106;
580+
CURRENT_PROJECT_VERSION = 107;
581581
DEVELOPMENT_TEAM = NPC44Y2C98;
582582
INFOPLIST_FILE = Runner/Info.plist;
583583
LD_RUNPATH_SEARCH_PATHS = (
584584
"$(inherited)",
585585
"@executable_path/../Frameworks",
586586
);
587587
MACOSX_DEPLOYMENT_TARGET = 10.15;
588-
MARKETING_VERSION = 5.0.106;
588+
MARKETING_VERSION = 5.0.107;
589589
PROVISIONING_PROFILE_SPECIFIER = "";
590590
SWIFT_VERSION = 5.0;
591591
};

‎pubspec.foss.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name: invoiceninja_flutter
22
description: Client for Invoice Ninja
3-
version: 5.0.106+106
3+
version: 5.0.107+107
44
homepage: https://invoiceninja.com
55
documentation: https://invoiceninja.github.io
66
publish_to: none

‎pubspec.next.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name: invoiceninja_flutter
22
description: Client for Invoice Ninja
3-
version: 5.0.106+106
3+
version: 5.0.107+107
44
homepage: https://invoiceninja.com
55
documentation: https://invoiceninja.github.io
66
publish_to: none

‎pubspec.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name: invoiceninja_flutter
22
description: Client for Invoice Ninja
3-
version: 5.0.106+106
3+
version: 5.0.107+107
44
homepage: https://invoiceninja.com
55
documentation: https://invoiceninja.github.io
66
publish_to: none

‎snap/snapcraft.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name: invoiceninja
2-
version: '5.0.106'
2+
version: '5.0.107'
33
summary: Create invoices, accept payments, track expenses & time-tasks
44
description: "### Note: if the app fails to run using `snap run invoiceninja` it may help to run `/snap/invoiceninja/current/bin/invoiceninja` instead
55

0 commit comments

Comments
 (0)