Merge branch 'develop'

invoiceninja · Jul 13, 2023 · 70cf4ea · 70cf4ea
2 parents fbd4d04 + c593c50
commit 70cf4ea
Show file tree

Hide file tree

Showing 5 changed files with 67 additions and 19 deletions.
diff --git a/lib/data/models/account_model.dart b/lib/data/models/account_model.dart
@@ -35,6 +35,7 @@ abstract class AccountEntity
       setReactAsDefaultAP: false,
       trialDaysLeft: 0,
       hasIapPlan: false,
+      paymentId: '',
     );
   }
 
@@ -107,6 +108,9 @@ abstract class AccountEntity
   @BuiltValueField(wireName: 'has_iap_plan')
   bool get hasIapPlan;
 
+  @BuiltValueField(wireName: 'payment_id')
+  String get paymentId;
+
   bool get isUpdateAvailable {
     if (disableAutoUpdate) {
       return false;
@@ -141,7 +145,8 @@ abstract class AccountEntity
     ..hostedClientCount = 0
     ..hostedCompanyCount = 1
     ..accountSmsVerified = true
-    ..setReactAsDefaultAP = false;
+    ..setReactAsDefaultAP = false
+    ..paymentId = '';
 
   static Serializer<AccountEntity> get serializer => _$accountEntitySerializer;
 }
diff --git a/lib/data/models/account_model.g.dart b/lib/data/models/account_model.g.dart
diff --git a/lib/data/models/document_model.dart b/lib/data/models/document_model.dart
@@ -151,6 +151,11 @@ abstract class DocumentEntity extends Object
         fileName.endsWith('.webp');
   }
 
+  bool get isPdf {
+    final fileName = name.toLowerCase();
+    return fileName.endsWith('.pdf');
+  }
+
   int compareTo(DocumentEntity document,
       [String sortField, bool sortAscending = true]) {
     int response = 0;

diff --git a/lib/ui/app/document_grid.dart b/lib/ui/app/document_grid.dart
@@ -24,6 +24,7 @@ import 'package:material_design_icons_flutter/material_design_icons_flutter.dart
 import 'package:path_provider/path_provider.dart';
 import 'package:permission_handler/permission_handler.dart';
 import 'package:pinch_zoom/pinch_zoom.dart';
+import 'package:printing/printing.dart';
 import 'package:share_plus/share_plus.dart';
 
 // Project imports:
@@ -312,17 +313,31 @@ class DocumentTile extends StatelessWidget {
                                     context: navigatorKey.currentContext,
                                     builder: (context) {
                                       return AlertDialog(
-                                          actions: [
-                                            TextButton(
-                                                onPressed: () =>
-                                                    Navigator.of(context).pop(),
-                                                child: Text(localization.close
-                                                    .toUpperCase())),
-                                          ],
-                                          content: PinchZoom(
-                                            child: Image.memory(
-                                                response.bodyBytes),
-                                          ));
+                                        actions: [
+                                          TextButton(
+                                              onPressed: () =>
+                                                  Navigator.of(context).pop(),
+                                              child: Text(localization.close
+                                                  .toUpperCase())),
+                                        ],
+                                        content: document.isImage
+                                            ? PinchZoom(
+                                                child: Image.memory(
+                                                    response.bodyBytes),
+                                              )
+                                            : SizedBox(
+                                                width: 600,
+                                                child: PdfPreview(
+                                                  build: (format) =>
+                                                      response.bodyBytes,
+                                                  canChangeOrientation: false,
+                                                  canChangePageFormat: false,
+                                                  allowPrinting: false,
+                                                  allowSharing: false,
+                                                  canDebug: false,
+                                                ),
+                                              ),
+                                      );
                                     });
                               } else if (value == localization.download) {
                                 final http.Response response = await WebClient()
@@ -399,7 +414,7 @@ class DocumentTile extends StatelessWidget {
                             },
                             itemBuilder: (context) {
                               return [
-                                if (document.isImage)
+                                if (document.isImage || document.isPdf)
                                   PopupMenuItem<String>(
                                     child: IconText(
                                       text: localization.view,
@@ -455,7 +470,7 @@ class DocumentPreview extends StatelessWidget {
   Widget build(BuildContext context) {
     final state = StoreProvider.of<AppState>(context).state;
 
-    if (['png', 'jpg', 'jpeg'].contains(document.type)) {
+    if (document.isImage) {
       return CachedNetworkImage(
           height: height,
           width: double.infinity,

diff --git a/lib/ui/settings/account_management.dart b/lib/ui/settings/account_management.dart
@@ -389,7 +389,9 @@ class _AccountOverview extends StatelessWidget {
                     ),
                   ),
                   onPressed: () {
-                    if (supportsInAppPurchase() && !account.hasIapPlan) {
+                    if (supportsInAppPurchase() &&
+                        !account.hasIapPlan &&
+                        account.paymentId.isEmpty) {
                       showDialog<void>(
                         context: context,
                         builder: (context) => UpgradeDialog(),