Merge branch 'develop'

.github/workflows/flatpak.yml

@@ -86,7 +86,7 @@ jobs:
           draft: false
           prerelease: false
           title: "Latest Release"
-          automatic_release_tag: "v5.0.160"
+          automatic_release_tag: "v5.0.161"
           files: |
             ${{ github.workspace }}/artifacts/Invoice-Ninja-Archive
             ${{ github.workspace }}/artifacts/Invoice-Ninja-Hash

bump_version.sh

@@ -18,4 +18,4 @@ echo "const FLUTTER_VERSION = const <String, String>" > lib/flutter_version.dart
 flutter --version --machine >> lib/flutter_version.dart
 echo ";" >> lib/flutter_version.dart
 sed -i "y/\"/'/" lib/flutter_version.dart
-dart dartfmt lib
+dart format lib

flatpak/com.invoiceninja.InvoiceNinja.metainfo.xml

@@ -50,6 +50,7 @@
   </screenshots>
   <content_rating type="oars-1.1"/>
   <releases>
+    <release version="5.0.161" date="2024-06-27"/>
     <release version="5.0.160" date="2024-05-22"/>
     <release version="5.0.159" date="2024-05-10"/>
     <release version="5.0.158" date="2024-04-24"/>

lib/constants.dart

@@ -6,7 +6,7 @@ class Constants {
 }
 
 // TODO remove version once #46609 is fixed
-const String kClientVersion = '5.0.160';
+const String kClientVersion = '5.0.161';
 const String kMinServerVersion = '5.0.4';
 
 const String kAppName = 'Invoice Ninja';
@@ -610,6 +610,10 @@ const String kReminderScheduleAfterInvoiceDate = 'after_invoice_date';
 const String kReminderScheduleBeforeDueDate = 'before_due_date';
 const String kReminderScheduleAfterDueDate = 'after_due_date';
 
+const String kQuoteReminderScheduleAfterQuoteDate = 'after_quote_date';
+const String kQuoteReminderScheduleBeforeValidUntil = 'before_valid_until_date';
+const String kQuoteReminderScheduleAfterValidUntil = 'after_valid_until_date';
+
 const String kSettingsCompanyDetails = 'company_details';
 const String kSettingsPaymentTerms = 'payment_terms';
 const String kSettingsPaymentTermView = 'payment_term/view';
@@ -1131,3 +1135,4 @@ const String kActivityEmailPayment = '138';
 const String kActivityExpenseNotificationSent = '139';
 const String kActivityStatementSent = '140';
 const String kActivityComment = '141';
+const String kActivityQuoteEmailReminder1 = '142';

lib/data/models/entities.dart

@@ -306,6 +306,7 @@ class EmailTemplate extends EnumClass {
   static const EmailTemplate reminder2 = _$reminder2_email;
   static const EmailTemplate reminder3 = _$reminder3_email;
   static const EmailTemplate reminder_endless = _$reminder_endless_email;
+  static const EmailTemplate quote_reminder1 = _$quote_reminder1_email;
   static const EmailTemplate custom1 = _$custom1_email;
   static const EmailTemplate custom2 = _$custom2_email;
   static const EmailTemplate custom3 = _$custom3_email;
@@ -858,6 +859,7 @@ abstract class ActivityEntity
       kActivityDeleteQuote,
       kActivityRestoreQuote,
       kActivityApproveQuote,
+      kActivityQuoteEmailReminder1,
     ].contains(activityTypeId)) {
       return EntityType.quote;
     } else if ([

lib/data/models/settings_model.dart

@@ -840,6 +840,27 @@ abstract class SettingsEntity
   @BuiltValueField(wireName: 'task_round_to_nearest')
   int? get taskRoundToNearest;
 
+  @BuiltValueField(wireName: 'email_quote_template_reminder1')
+  String? get emailBodyQuoteReminder1;
+
+  @BuiltValueField(wireName: 'email_quote_subject_reminder1')
+  String? get emailSubjectQuoteReminder1;
+
+  @BuiltValueField(wireName: 'enable_quote_reminder1')
+  bool? get enableQuoteReminder1;
+
+  @BuiltValueField(wireName: 'quote_num_days_reminder1')
+  int? get numDaysQuoteReminder1;
+
+  @BuiltValueField(wireName: 'quote_schedule_reminder1')
+  String? get scheduleQuoteReminder1;
+
+  @BuiltValueField(wireName: 'quote_late_fee_amount1')
+  double? get quoteLateFeeAmount1;
+
+  @BuiltValueField(wireName: 'quote_late_fee_percent1')
+  double? get quoteLateFeePercent1;
+
   bool? get taskRoundingEnabled =>
       taskRoundToNearest == null ? null : taskRoundToNearest != 1;
 
@@ -958,8 +979,10 @@ abstract class SettingsEntity
         return emailSubjectCustom3;
       case EmailTemplate.purchase_order:
         return emailSubjectPurchaseOrder;
+      case EmailTemplate.quote_reminder1:
+        return emailSubjectQuoteReminder1;
       default:
-        return 'Error: template not defined for $emailTemplate';
+        return 'Error: subject template not defined for $emailTemplate';
     }
   }
 
@@ -993,8 +1016,10 @@ abstract class SettingsEntity
         return emailBodyCustom3;
       case EmailTemplate.purchase_order:
         return emailBodyPurchaseOrder;
+      case EmailTemplate.quote_reminder1:
+        return emailBodyQuoteReminder1;
       default:
-        return 'Error: template not defined for $template';
+        return 'Error: body template not defined for $template';
     }
   }