Merge branch 'develop'

Author: hillelcoren

.github/workflows/build.yml

@@ -11,6 +11,7 @@ jobs:
       commit_email: ${{secrets.commit_email}}
       commit_name: ${{secrets.commit_name}}
       app_sentry: ${{secrets.app_sentry}}
+      api_secret: ${{secrets.api_secret}}
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v1
@@ -23,7 +24,7 @@ jobs:
       - run: |
           cp lib/.env.dart.example lib/.env.dart
           cp android/app/build.gradle.prod android/app/build.gradle
-          sed -i 's/secret/password/g' lib/.env.dart
+          sed -i 's/secret/${{secrets.api_secret}}/g' lib/.env.dart
           sed -i 's/dns/${{secrets.app_sentry}}/g' lib/.env.dart
           sed -i -e '/OTHER_LANGUAGES/{r lib/utils/i18n' -e 'd}' lib/utils/i18n.dart
       - run: flutter upgrade

lib/constants.dart

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

lib/ui/reports/document_report.dart

@@ -153,7 +153,6 @@ ReportResult documentReport(
     return skip ? null : row;
   }
 
-  /* TODO enable this code
   clientMap.forEach((clientId, client) {
     client.documents.forEach((document) {
       final row = _getRow(client, document);
@@ -163,8 +162,6 @@ ReportResult documentReport(
     });
   });
 
-   */
-
   productMap.forEach((productId, product) {
     product.documents.forEach((document) {
       final row = _getRow(product, document);

lib/ui/reports/expense_report.dart

@@ -124,31 +124,31 @@ ReportResult expenseReport(
           value = expense.taxRate3;
           break;
         case ExpenseReportFields.client:
-          value = client.displayName;
+          value = client?.displayName;
           break;
         case ExpenseReportFields.client_balance:
-          value = client.balance;
+          value = client?.balance;
           break;
         case ExpenseReportFields.client_address1:
-          value = client.address1;
+          value = client?.address1;
           break;
         case ExpenseReportFields.client_address2:
-          value = client.address2;
+          value = client?.address2;
           break;
         case ExpenseReportFields.client_shipping_address1:
-          value = client.shippingAddress1;
+          value = client?.shippingAddress1;
           break;
         case ExpenseReportFields.client_shipping_address2:
-          value = client.shippingAddress2;
+          value = client?.shippingAddress2;
           break;
         case ExpenseReportFields.invoice:
-          value = invoice.listDisplayName;
+          value = invoice?.listDisplayName;
           break;
         case ExpenseReportFields.invoice_amount:
-          value = invoice.amount;
+          value = invoice?.amount;
           break;
         case ExpenseReportFields.vendor:
-          value = vendor.listDisplayName;
+          value = vendor?.listDisplayName;
           break;
         case ExpenseReportFields.custom_value1:
           value = expense.customValue1;

lib/ui/reports/profit_loss_report.dart

@@ -82,19 +82,19 @@ ReportResult profitAndLossReport(
 
       switch (column) {
         case ProfitAndLossReportFields.client:
-          value = client.displayName;
+          value = client?.displayName;
           break;
         case ProfitAndLossReportFields.client_address1:
-          value = client.address1;
+          value = client?.address1;
           break;
         case ProfitAndLossReportFields.client_address2:
-          value = client.address2;
+          value = client?.address2;
           break;
         case ProfitAndLossReportFields.client_shipping_address1:
-          value = client.shippingAddress1;
+          value = client?.shippingAddress1;
           break;
         case ProfitAndLossReportFields.client_shipping_address2:
-          value = client.shippingAddress2;
+          value = client?.shippingAddress2;
           break;
         case ProfitAndLossReportFields.vendor:
           value = vendor?.listDisplayName;
@@ -109,10 +109,10 @@ ReportResult profitAndLossReport(
           value = staticState.countryMap[vendor?.countryId];
           break;
         case ProfitAndLossReportFields.amount:
-          value = payment.amount;
+          value = payment?.amount;
           break;
         case ProfitAndLossReportFields.date:
-          value = payment.date;
+          value = payment?.date;
           break;
       }
 
@@ -153,22 +153,22 @@ ReportResult profitAndLossReport(
 
       switch (column) {
         case ProfitAndLossReportFields.client:
-          value = client.displayName;
+          value = client?.displayName;
           break;
         case ProfitAndLossReportFields.client_address1:
-          value = client.address1;
+          value = client?.address1;
           break;
         case ProfitAndLossReportFields.client_address2:
-          value = client.address2;
+          value = client?.address2;
           break;
         case ProfitAndLossReportFields.client_shipping_address1:
-          value = client.shippingAddress1;
+          value = client?.shippingAddress1;
           break;
         case ProfitAndLossReportFields.client_shipping_address2:
-          value = client.shippingAddress2;
+          value = client?.shippingAddress2;
           break;
         case ProfitAndLossReportFields.vendor:
-          value = vendor.listDisplayName;
+          value = vendor?.listDisplayName;
           break;
         case ProfitAndLossReportFields.vendor_city:
           value = vendor?.city;

lib/ui/reports/reports_screen.dart

@@ -75,10 +75,10 @@ class ReportsScreen extends StatelessWidget {
           if (state.company.hasTaxes)
             kReportTaxRate,
           kReportDocument,
-          //kReportExpense,
-          //kReportProduct,
-          //kReportProfitAndLoss,
-          //kReportTask,
+          kReportExpense,
+          kReportProduct,
+          kReportProfitAndLoss,
+          kReportTask,
         ]
             .map((report) =>
             DropdownMenuItem(

lib/ui/reports/task_report.dart

@@ -9,6 +9,7 @@ import 'package:invoiceninja_flutter/redux/reports/reports_state.dart';
 import 'package:invoiceninja_flutter/redux/static/static_state.dart';
 import 'package:invoiceninja_flutter/ui/reports/reports_screen.dart';
 import 'package:memoize/memoize.dart';
+import 'package:invoiceninja_flutter/utils/extensions.dart';
 
 enum TaskReportFields {
   rate,
@@ -117,12 +118,10 @@ ReportResult taskReport(
           );
           break;
         case TaskReportFields.start_date:
-          // TODO: Check
-          value = task.taskTimes[0]?.startDate;
+          value = task.taskTimes.firstOrNull?.startDate;
           break;
         case TaskReportFields.end_date:
-          // TODO: Check
-          value = task.taskTimes[0]?.endDate;
+          value = task.taskTimes.firstOrNull?.endDate;
           break;
         case TaskReportFields.description:
           value = task.description;

lib/utils/extensions.dart

@@ -17,3 +17,7 @@ extension ContextHelper on BuildContext {
     return store.state;
   }
 }
+
+extension ListHelper<T> on List<T> {
+  T get firstOrNull => isEmpty ? null : first;
+}

pubspec.yaml

@@ -1,6 +1,6 @@
 name: invoiceninja_flutter
 description: Client for Invoice Ninja
-version: 5.0.23+23
+version: 5.0.24+24
 author: Hillel Coren
 homepage: https://invoiceninja.com
 documentation: http://docs.invoiceninja.com