Merge branch 'develop'

invoiceninja · Nov 17, 2023 · 8b8956c · 8b8956c
2 parents 2f70218 + 5b2e3af
commit 8b8956c
Show file tree

Hide file tree

Showing 16 changed files with 212 additions and 206 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.140"
+          automatic_release_tag: "v5.0.141"
           files: |
             ${{ github.workspace }}/artifacts/Invoice-Ninja-Archive
             ${{ github.workspace }}/artifacts/Invoice-Ninja-Hash

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.141" date="2023-11-17"/>
     <release version="5.0.140" date="2023-11-14"/>
     <release version="5.0.139" date="2023-11-12"/>
     <release version="5.0.138" date="2023-11-03"/>

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.140';
+const String kClientVersion = '5.0.141';
 const String kMinServerVersion = '5.0.4';
 
 const String kAppName = 'Invoice Ninja';

diff --git a/lib/data/models/settings_model.dart b/lib/data/models/settings_model.dart
@@ -30,6 +30,21 @@ abstract class SettingsEntity
           clientSettings?.defaultPurchaseOrderDesignId ??
               groupSettings?.defaultPurchaseOrderDesignId ??
               companySettings?.defaultPurchaseOrderDesignId,
+      defaultStatementDesignId: clientSettings?.defaultStatementDesignId ??
+          groupSettings?.defaultStatementDesignId ??
+          companySettings?.defaultStatementDesignId,
+      defaultDeliveryNoteDesignId:
+          clientSettings?.defaultDeliveryNoteDesignId ??
+              groupSettings?.defaultDeliveryNoteDesignId ??
+              companySettings?.defaultDeliveryNoteDesignId,
+      defaultPaymentReceiptDesignId:
+          clientSettings?.defaultPaymentReceiptDesignId ??
+              groupSettings?.defaultPaymentReceiptDesignId ??
+              companySettings?.defaultPaymentReceiptDesignId,
+      defaultPaymentRefundDesignId:
+          clientSettings?.defaultPaymentRefundDesignId ??
+              groupSettings?.defaultPaymentRefundDesignId ??
+              companySettings?.defaultPaymentRefundDesignId,
       defaultInvoiceTerms: clientSettings?.defaultInvoiceTerms ??
           groupSettings?.defaultInvoiceTerms ??
           companySettings?.defaultInvoiceTerms,

diff --git a/lib/redux/app/app_state.dart b/lib/redux/app/app_state.dart
@@ -850,6 +850,11 @@ abstract class AppState implements Built<AppState, AppStateBuilder> {
   bool get isUpdateAvailable =>
       isSelfHosted && account.isUpdateAvailable && userCompany.isAdmin;
 
+  bool get isUsingPostmark => [
+        if (isHosted) SettingsEntity.EMAIL_SENDING_METHOD_DEFAULT,
+        SettingsEntity.EMAIL_SENDING_METHOD_POSTMARK,
+      ].contains(company.settings.emailSendingMethod);
+
   bool get isUserConfirmed {
     if (isSelfHosted) {
       return true;

diff --git a/lib/ui/app/entities/entity_list_tile.dart b/lib/ui/app/entities/entity_list_tile.dart
@@ -117,7 +117,7 @@ class _EntityListTileState extends State<EntityListTile> {
               formatDate(entity.date, context);
     } else if (entity is ExpenseEntity) {
       defaultSubtitle =
-          formatNumber(entity.amount, context, clientId: entity.clientId)! +
+          formatNumber(entity.amount, context, currencyId: entity.currencyId)! +
               ' • ' +
               formatDate(entity.date, context);
     } else if (entity is TransactionEntity) {

diff --git a/lib/ui/app/portal_links.dart b/lib/ui/app/portal_links.dart
@@ -43,17 +43,9 @@ class PortalLinks extends StatelessWidget {
       viewLinkWithHash += '&client_hash=${client!.clientHash}';
     }
 
-    var copyLinkWithHash = copyLink;
-    if (!copyLink.contains('?')) {
-      copyLinkWithHash += '?';
-    }
-    if (client != null) {
-      copyLinkWithHash += '&client_hash=${client!.clientHash}';
-    }
-
     final viewLinkPressed = () => launchUrl(Uri.parse(viewLinkWithHash));
     final copyLinkPressed = () {
-      Clipboard.setData(ClipboardData(text: copyLinkWithHash));
+      Clipboard.setData(ClipboardData(text: copyLink));
       showToast(localization!.copiedToClipboard.replaceFirst(':value ', ''));
     };
 

diff --git a/lib/ui/auth/login_view.dart b/lib/ui/auth/login_view.dart
@@ -455,6 +455,7 @@ class _LoginState extends State<LoginView> {
                                       val.isEmpty || val.trim().isEmpty
                                           ? localization.pleaseEnterYourEmail
                                           : null,
+                                  autofillHints: [AutofillHints.username],
                                 ),
                               if (_loginType == LOGIN_TYPE_EMAIL &&
                                   !_recoverPassword)

diff --git a/lib/ui/dashboard/dashboard_screen.dart b/lib/ui/dashboard/dashboard_screen.dart
@@ -267,27 +267,32 @@ class _DashboardScreenState extends State<DashboardScreen>
               child: IconButton(
                 tooltip: localization!.enableReactApp,
                 onPressed: () async {
-                  final credentials = state.credentials;
-                  final account = state.account
-                      .rebuild((b) => b..setReactAsDefaultAP = true);
-                  final url = '${credentials.url}/accounts/${account.id}';
-                  final data = serializers.serializeWith(
-                      AccountEntity.serializer, account);
-
-                  store.dispatch(StartSaving());
-                  WebClient()
-                      .put(
-                    url,
-                    credentials.token,
-                    data: json.encode(data),
-                  )
-                      .then((dynamic _) {
-                    store.dispatch(StopSaving());
-                    WebUtils.reloadBrowser();
-                  }).catchError((Object error) {
-                    store.dispatch(StopSaving());
-                    showErrorDialog(message: error as String?);
-                  });
+                  confirmCallback(
+                      context: context,
+                      message: localization.enableReactApp,
+                      callback: (_) {
+                        final credentials = state.credentials;
+                        final account = state.account
+                            .rebuild((b) => b..setReactAsDefaultAP = true);
+                        final url = '${credentials.url}/accounts/${account.id}';
+                        final data = serializers.serializeWith(
+                            AccountEntity.serializer, account);
+
+                        store.dispatch(StartSaving());
+                        WebClient()
+                            .put(
+                          url,
+                          credentials.token,
+                          data: json.encode(data),
+                        )
+                            .then((dynamic _) {
+                          store.dispatch(StopSaving());
+                          WebUtils.reloadBrowser();
+                        }).catchError((Object error) {
+                          store.dispatch(StopSaving());
+                          showErrorDialog(message: error as String?);
+                        });
+                      });
                 },
                 icon: Icon(MdiIcons.react),
               ),