Merge branch 'develop'

invoiceninja · Jan 12, 2024 · 2b3e248 · 2b3e248
2 parents a0fcc6b + ce13a35
commit 2b3e248
Show file tree

Hide file tree

Showing 18 changed files with 270 additions and 126 deletions.
diff --git a/.github/workflows/flatpak.yml b/.github/workflows/flatpak.yml
@@ -86,7 +86,7 @@ jobs:
           draft: false
           prerelease: false
           title: "Latest Release"
-          automatic_release_tag: "v5.0.148"
+          automatic_release_tag: "v5.0.149"
           files: |
             ${{ github.workspace }}/artifacts/Invoice-Ninja-Archive
             ${{ github.workspace }}/artifacts/Invoice-Ninja-Hash

diff --git a/codemagic.yaml b/codemagic.yaml
@@ -32,6 +32,7 @@ workflows:
       #- flutter build linux --release
       #- export SNAPCRAFT_STORE_CREDENTIALS=$(echo $SNAPCRAFT_LOGIN_CREDENTIALS)
       - snapcraft whoami
+      - sudo snap refresh snapcraft --channel=7.x/stable
       - snapcraft snap --output invoiceninja.snap
       - snapcraft upload invoiceninja.snap --release stable
     artifacts:

diff --git a/flatpak/com.invoiceninja.InvoiceNinja.metainfo.xml b/flatpak/com.invoiceninja.InvoiceNinja.metainfo.xml
@@ -50,6 +50,7 @@
   </screenshots>
   <content_rating type="oars-1.1"/>
   <releases>
+    <release version="5.0.149" date="2024-01-12"/>
     <release version="5.0.148" date="2024-01-08"/>
     <release version="5.0.147" date="2024-01-02"/>
     <release version="5.0.146" date="2023-12-20"/>

diff --git a/lib/constants.dart b/lib/constants.dart
@@ -4,7 +4,7 @@ class Constants {
 }
 
 // TODO remove version once #46609 is fixed
-const String kClientVersion = '5.0.148';
+const String kClientVersion = '5.0.149';
 const String kMinServerVersion = '5.0.4';
 
 const String kAppName = 'Invoice Ninja';
@@ -76,9 +76,11 @@ const String kDocsEmailVariablesUrl =
     '$kDocsUrl/email-customization/#payment-email-customization';
 const String kDocsStripeConnectUrl = '$kDocsUrl/hosted-stripe';
 
+const String kPHPDateFormatsUrl =
+    'https://www.php.net/manual/en/datetime.format.php#refsect1-datetime.format-parameters';
 const String kForumUrl = 'https://forum.invoiceninja.com';
-const String kApiDocsURL = 'https://api-docs.invoicing.co';
-const String kZapierURL = 'https://zapier.com/apps/invoice-ninja';
+const String kApiDocsUrl = 'https://api-docs.invoicing.co';
+const String kZapierUrl = 'https://zapier.com/apps/invoice-ninja';
 const String kGatewayFeeHelpURL =
     'https://support.stripe.com/questions/passing-the-stripe-fee-on-to-customers';
 

diff --git a/lib/data/models/transaction_model.dart b/lib/data/models/transaction_model.dart
@@ -66,6 +66,7 @@ class TransactionFields {
   static const String status = 'status';
   static const String accountType = 'account_type';
   static const String defaultCategory = 'default_category';
+  static const String participantName = 'participant_name';
 }
 
 abstract class TransactionEntity extends Object

diff --git a/lib/data/repositories/credit_repository.dart b/lib/data/repositories/credit_repository.dart
@@ -39,7 +39,7 @@ class CreditRepository {
 
   Future<BuiltList<InvoiceEntity>> loadList(
       Credentials credentials, int createdAt, bool filterDeleted) async {
-    String url = credentials.url+ '/credits?created_at=$createdAt';
+    String url = credentials.url + '/credits?created_at=$createdAt';
 
     if (filterDeleted) {
       url += '&filter_deleted_clients=true';
@@ -62,7 +62,7 @@ class CreditRepository {
     }
 
     final url =
-        credentials.url+ '/credits/bulk?per_page=$kMaxEntitiesPerBulkAction';
+        credentials.url + '/credits/bulk?per_page=$kMaxEntitiesPerBulkAction';
     final dynamic response = await webClient.post(url, credentials.token,
         data: json.encode({
           'ids': ids,
@@ -87,7 +87,7 @@ class CreditRepository {
     dynamic response;
 
     if (credit.isNew) {
-      url = credentials.url+ '/credits?include=activities.history';
+      url = credentials.url + '/credits?include=activities.history';
     } else {
       url =
           '${credentials.url}/credits/${credit.id}?include=activities.history';
@@ -122,7 +122,7 @@ class CreditRepository {
     String ccEmail,
   ) async {
     final data = {
-      'entity': '${credit.entityType}',
+      'entity': '${EntityType.credit.apiValue}',
       'entity_id': credit.id,
       'template': 'email_template_$template',
       'body': body,
@@ -131,7 +131,7 @@ class CreditRepository {
     };
 
     final dynamic response = await webClient.post(
-        credentials.url+ '/emails', credentials.token,
+        credentials.url + '/emails', credentials.token,
         data: json.encode(data));
 
     final InvoiceItemResponse invoiceResponse =

diff --git a/lib/data/repositories/invoice_repository.dart b/lib/data/repositories/invoice_repository.dart
@@ -39,7 +39,7 @@ class InvoiceRepository {
 
   Future<BuiltList<InvoiceEntity>> loadList(Credentials credentials, int page,
       int createdAt, bool filterDeleted) async {
-    String url = credentials.url+
+    String url = credentials.url +
         '/invoices?per_page=$kMaxRecordsPerPage&page=$page&created_at=$createdAt';
 
     if (filterDeleted) {
@@ -63,7 +63,7 @@ class InvoiceRepository {
     }
 
     final url =
-        credentials.url+ '/invoices/bulk?per_page=$kMaxEntitiesPerBulkAction';
+        credentials.url + '/invoices/bulk?per_page=$kMaxEntitiesPerBulkAction';
     final dynamic response = await webClient.post(url, credentials.token,
         data: json.encode({
           'ids': ids,
@@ -88,7 +88,7 @@ class InvoiceRepository {
     String url;
 
     if (invoice.isNew) {
-      url = credentials.url+ '/invoices?include=activities.history';
+      url = credentials.url + '/invoices?include=activities.history';
     } else {
       url =
           '${credentials.url}/invoices/${invoice.id}?include=activities.history';
@@ -134,7 +134,7 @@ class InvoiceRepository {
     String ccEmail,
   ) async {
     final data = {
-      'entity': '${invoice.entityType}',
+      'entity': '${EntityType.invoice.apiValue}',
       'entity_id': invoice.id,
       'template': 'email_template_$template',
       'body': body,
@@ -143,7 +143,7 @@ class InvoiceRepository {
     };
 
     final dynamic response = await webClient.post(
-        credentials.url+ '/emails', credentials.token,
+        credentials.url + '/emails', credentials.token,
         data: json.encode(data));
 
     final InvoiceItemResponse invoiceResponse =

diff --git a/lib/data/repositories/purchase_order_repository.dart b/lib/data/repositories/purchase_order_repository.dart
@@ -33,7 +33,7 @@ class PurchaseOrderRepository {
     int createdAt,
     //bool filterDeleted,
   ) async {
-    final url = credentials.url+
+    final url = credentials.url +
         '/purchase_orders?per_page=$kMaxRecordsPerPage&page=$page&created_at=$createdAt';
 
     /*
@@ -57,7 +57,7 @@ class PurchaseOrderRepository {
       ids = ids.sublist(0, kMaxEntitiesPerBulkAction);
     }
 
-    final url = credentials.url+
+    final url = credentials.url +
         '/purchase_orders/bulk?per_page=$kMaxEntitiesPerBulkAction';
     final dynamic response = await webClient.post(url, credentials.token,
         data: json.encode({
@@ -87,7 +87,7 @@ class PurchaseOrderRepository {
     dynamic response;
 
     if (purchaseOrder.isNew) {
-      url = credentials.url+ '/purchase_orders?include=activities.history';
+      url = credentials.url + '/purchase_orders?include=activities.history';
     } else {
       url =
           '${credentials.url}/purchase_orders/${purchaseOrder.id}?include=activities.history';
@@ -129,7 +129,7 @@ class PurchaseOrderRepository {
     String ccEmail,
   ) async {
     final data = {
-      'entity': '${purchaseOrder.entityType}',
+      'entity': '${EntityType.purchaseOrder.apiValue}',
       'entity_id': purchaseOrder.id,
       'template': 'email_template_$template',
       'body': body,
@@ -138,7 +138,7 @@ class PurchaseOrderRepository {
     };
 
     final dynamic response = await webClient.post(
-        credentials.url+ '/emails', credentials.token,
+        credentials.url + '/emails', credentials.token,
         data: json.encode(data));
 
     final InvoiceItemResponse invoiceResponse =

diff --git a/lib/data/repositories/quote_repository.dart b/lib/data/repositories/quote_repository.dart
@@ -39,7 +39,7 @@ class QuoteRepository {
 
   Future<BuiltList<InvoiceEntity>> loadList(Credentials credentials, int page,
       int createdAt, bool filterDeleted) async {
-    String url = credentials.url+
+    String url = credentials.url +
         '/quotes?per_page=$kMaxRecordsPerPage&page=$page&created_at=$createdAt';
 
     if (filterDeleted) {
@@ -63,7 +63,7 @@ class QuoteRepository {
     }
 
     final url =
-        credentials.url+ '/quotes/bulk?per_page=$kMaxEntitiesPerBulkAction';
+        credentials.url + '/quotes/bulk?per_page=$kMaxEntitiesPerBulkAction';
     final dynamic response = await webClient.post(url, credentials.token,
         data: json.encode({
           'ids': ids,
@@ -88,7 +88,7 @@ class QuoteRepository {
     dynamic response;
 
     if (quote.isNew) {
-      url = credentials.url+ '/quotes?include=activities.history';
+      url = credentials.url + '/quotes?include=activities.history';
     } else {
       url = '${credentials.url}/quotes/${quote.id}?include=activities.history';
     }
@@ -131,7 +131,7 @@ class QuoteRepository {
     String ccEmail,
   ) async {
     final data = {
-      'entity': '${quote.entityType}',
+      'entity': '${EntityType.quote.apiValue}',
       'entity_id': quote.id,
       'template': 'email_template_$template',
       'body': body,
@@ -140,7 +140,7 @@ class QuoteRepository {
     };
 
     final dynamic response = await webClient.post(
-        credentials.url+ '/emails', credentials.token,
+        credentials.url + '/emails', credentials.token,
         data: json.encode(data));
 
     final InvoiceItemResponse invoiceResponse =

diff --git a/lib/ui/app/list_scaffold.dart b/lib/ui/app/list_scaffold.dart
@@ -125,9 +125,11 @@ class ListScaffold extends StatelessWidget {
     );
 
     return PopScope(
-        canPop: false,
+        canPop: !isSettings,
         onPopInvoked: (_) {
-          store.dispatch(ViewDashboard());
+          if (!isSettings) {
+            store.dispatch(ViewDashboard());
+          }
         },
         child: FocusTraversalGroup(
           child: Scaffold(

diff --git a/lib/ui/reports/transaction_report.dart b/lib/ui/reports/transaction_report.dart
@@ -34,6 +34,7 @@ enum TransactionReportFields {
   created_at,
   updated_at,
   record_state,
+  participant_name,
 }
 
 var memoizedTransactionReport = memo10((
@@ -178,6 +179,10 @@ ReportResult transactionReport(
         case TransactionReportFields.record_state:
           value = AppLocalization.of(navigatorKey.currentContext!)!
               .lookup(transaction.entityState);
+          break;
+        case TransactionReportFields.participant_name:
+          value = transaction.participantName;
+          break;
       }
 
       if (!ReportResult.matchField(

diff --git a/lib/ui/settings/account_management.dart b/lib/ui/settings/account_management.dart
@@ -561,15 +561,15 @@ class _AccountOverview extends StatelessWidget {
                 child: AppButton(
                   label: localization.apiDocs.toUpperCase(),
                   iconData: isMobile(context) ? null : MdiIcons.bookshelf,
-                  onPressed: () => launchUrl(Uri.parse(kApiDocsURL)),
+                  onPressed: () => launchUrl(Uri.parse(kApiDocsUrl)),
                 ),
               ),
               SizedBox(width: kGutterWidth),
               Expanded(
                 child: AppButton(
                   label: 'Zapier',
                   iconData: isMobile(context) ? null : MdiIcons.cloud,
-                  onPressed: () => launchUrl(Uri.parse(kZapierURL)),
+                  onPressed: () => launchUrl(Uri.parse(kZapierUrl)),
                 ),
               ),
             ])),

diff --git a/lib/ui/settings/generated_numbers.dart b/lib/ui/settings/generated_numbers.dart
@@ -557,9 +557,11 @@ class _EntityNumberSettingsState extends State<EntityNumberSettings> {
           padding:
               const EdgeInsets.only(left: 16, top: 20, right: 16, bottom: 8),
           child: OutlinedButton(
-            child: Text(localization.viewDateFormats.toUpperCase()),
-            onPressed: () => launchUrl(
-                Uri.parse('https://www.php.net/manual/en/datetime.format.php')),
+            child: Padding(
+              padding: const EdgeInsets.symmetric(vertical: 10),
+              child: Text(localization.viewDateFormats.toUpperCase()),
+            ),
+            onPressed: () => launchUrl(Uri.parse(kPHPDateFormatsUrl)),
           ),
         ),
         HelpPanel(

diff --git a/lib/ui/transaction/transaction_presenter.dart b/lib/ui/transaction/transaction_presenter.dart
@@ -35,6 +35,7 @@ class TransactionPresenter extends EntityPresenter {
       TransactionFields.category,
       TransactionFields.payment,
       TransactionFields.defaultCategory,
+      TransactionFields.participantName,
     ];
   }
 
@@ -76,6 +77,8 @@ class TransactionPresenter extends EntityPresenter {
         );
       case TransactionFields.description:
         return Text(transaction!.description);
+      case TransactionFields.participantName:
+        return Text(transaction!.participantName);
       case TransactionFields.accountType:
         final bankAccount =
             state.bankAccountState.get(transaction!.bankAccountId);