Merge branch 'develop'

invoiceninja · Jun 30, 2024 · 6f01996 · 6f01996
2 parents 360914d + 8cc43bf
commit 6f01996
Show file tree

Hide file tree

Showing 4 changed files with 2,506 additions and 523 deletions.
diff --git a/lib/data/models/product_model.dart b/lib/data/models/product_model.dart
@@ -343,6 +343,10 @@ abstract class ProductEntity extends Object
         actions.add(EntityAction.newInvoice);
       }
 
+      if (userCompany!.canCreate(EntityType.quote) && !isDeleted!) {
+        actions.add(EntityAction.newQuote);
+      }
+
       if (userCompany.canCreate(EntityType.purchaseOrder) && !isDeleted!) {
         actions.add(EntityAction.newPurchaseOrder);
       }

diff --git a/lib/redux/product/product_actions.dart b/lib/redux/product/product_actions.dart
@@ -296,6 +296,24 @@ void handleProductAction(
         ),
       );
       break;
+    case EntityAction.newQuote:
+      final invoice = InvoiceEntity(state: state, entityType: EntityType.quote);
+      createEntity(
+        entity: invoice.rebuild(
+          (b) => b
+            ..lineItems.addAll(
+              productIds.map(
+                (productId) => convertProductToInvoiceItem(
+                  company: state.company,
+                  invoice: invoice,
+                  product: state.productState.map[productId],
+                  currencyMap: state.staticState.currencyMap,
+                ),
+              ),
+            ),
+        ),
+      );
+      break;
     case EntityAction.newPurchaseOrder:
       final invoice =
           InvoiceEntity(state: state, entityType: EntityType.purchaseOrder);

diff --git a/lib/ui/system/update_dialog.dart b/lib/ui/system/update_dialog.dart
@@ -1,5 +1,6 @@
 // Dart imports:
 import 'dart:convert';
+import 'package:http/http.dart' as http;
 
 // Flutter imports:
 import 'package:flutter/foundation.dart';
@@ -37,6 +38,23 @@ enum UpdateState {
 class _UpdateDialogState extends State<UpdateDialog> {
   UpdateState updateState = UpdateState.initial;
   String? updateResponse;
+  String? phpVersion;
+
+  @override
+  void initState() {
+    super.initState();
+
+    http
+        .read(Uri.parse(
+            'https://github.com/invoiceninja/invoiceninja/blob/v5-develop/composer.json?raw=true'))
+        .then((value) {
+      final data = jsonDecode(value);
+      setState(() {
+        phpVersion = data['require']['php'] ?? '';
+        phpVersion = phpVersion!.replaceFirst('^', '');
+      });
+    });
+  }
 
   @override
   Widget build(BuildContext context) {
@@ -103,6 +121,9 @@ class _UpdateDialogState extends State<UpdateDialog> {
                         trailing: Icon(Icons.copy),
                       ),
                     ],
+                    SizedBox(height: 20),
+                    Text(localization.latestRequiresPhpVersion
+                        .replaceFirst(':version', phpVersion ?? '...')),
                   ],
                 ),
       actions: <Widget>[