refacto: merging qrcode data and requests data

lib/l10n/app_en.arb

@@ -968,6 +968,13 @@
   "paiementPaymentRequestError": "Error processing payment request",
   "paiementAccept": "Accept",
   "paiementRefuse": "Refuse",
+  "paiementRequestHistory": "Activities",
+  "paiementRequestStatusPending": "Pending",
+  "paiementRequestStatusRefused": "Refused",
+  "paiementRequestStatusExpired": "Expired",
+  "paiementRequestStatusAccepted": "Accepted",
+  "paiementRequestDetails": "Request details",
+  "paiementNoRequests": "No payment requests",
   "paiementSuccessfullyAddedStore": "Store successfully added",
   "paiementSuccessfullyModifiedStore": "Store successfully updated",
   "paiementThe": "The",

lib/l10n/app_fr.arb

@@ -976,6 +976,13 @@
   "paiementPaymentRequestError": "Erreur lors du traitement de la demande",
   "paiementAccept": "Accepter",
   "paiementRefuse": "Refuser",
+  "paiementRequestHistory": "Activités",
+  "paiementRequestStatusPending": "En attente",
+  "paiementRequestStatusRefused": "Refusée",
+  "paiementRequestStatusExpired": "Expirée",
+  "paiementRequestStatusAccepted": "Acceptée",
+  "paiementRequestDetails": "Détails de la demande",
+  "paiementNoRequests": "Aucune demande de paiement",
   "paiementSuccessfullyAddedStore": "Magasin ajoutée avec succès",
   "paiementSuccessfullyModifiedStore": "Magasin modifiée avec succès",
   "paiementThe": "Le",

lib/l10n/app_localizations.dart

@@ -5246,6 +5246,48 @@ abstract class AppLocalizations {
   /// **'Refuser'**
   String get paiementRefuse;
 
+  /// No description provided for @paiementRequestHistory.
+  ///
+  /// In fr, this message translates to:
+  /// **'Activités'**
+  String get paiementRequestHistory;
+
+  /// No description provided for @paiementRequestStatusPending.
+  ///
+  /// In fr, this message translates to:
+  /// **'En attente'**
+  String get paiementRequestStatusPending;
+
+  /// No description provided for @paiementRequestStatusRefused.
+  ///
+  /// In fr, this message translates to:
+  /// **'Refusée'**
+  String get paiementRequestStatusRefused;
+
+  /// No description provided for @paiementRequestStatusExpired.
+  ///
+  /// In fr, this message translates to:
+  /// **'Expirée'**
+  String get paiementRequestStatusExpired;
+
+  /// No description provided for @paiementRequestStatusAccepted.
+  ///
+  /// In fr, this message translates to:
+  /// **'Acceptée'**
+  String get paiementRequestStatusAccepted;
+
+  /// No description provided for @paiementRequestDetails.
+  ///
+  /// In fr, this message translates to:
+  /// **'Détails de la demande'**
+  String get paiementRequestDetails;
+
+  /// No description provided for @paiementNoRequests.
+  ///
+  /// In fr, this message translates to:
+  /// **'Aucune demande de paiement'**
+  String get paiementNoRequests;
+
   /// No description provided for @paiementSuccessfullyAddedStore.
   ///
   /// In fr, this message translates to:

lib/l10n/app_localizations_en.dart

@@ -2669,6 +2669,27 @@ class AppLocalizationsEn extends AppLocalizations {
   @override
   String get paiementRefuse => 'Refuse';
 
+  @override
+  String get paiementRequestHistory => 'Activities';
+
+  @override
+  String get paiementRequestStatusPending => 'Pending';
+
+  @override
+  String get paiementRequestStatusRefused => 'Refused';
+
+  @override
+  String get paiementRequestStatusExpired => 'Expired';
+
+  @override
+  String get paiementRequestStatusAccepted => 'Accepted';
+
+  @override
+  String get paiementRequestDetails => 'Request details';
+
+  @override
+  String get paiementNoRequests => 'No payment requests';
+
   @override
   String get paiementSuccessfullyAddedStore => 'Store successfully added';
 

lib/l10n/app_localizations_fr.dart

@@ -2699,6 +2699,27 @@ class AppLocalizationsFr extends AppLocalizations {
   @override
   String get paiementRefuse => 'Refuser';
 
+  @override
+  String get paiementRequestHistory => 'Activités';
+
+  @override
+  String get paiementRequestStatusPending => 'En attente';
+
+  @override
+  String get paiementRequestStatusRefused => 'Refusée';
+
+  @override
+  String get paiementRequestStatusExpired => 'Expirée';
+
+  @override
+  String get paiementRequestStatusAccepted => 'Acceptée';
+
+  @override
+  String get paiementRequestDetails => 'Détails de la demande';
+
+  @override
+  String get paiementNoRequests => 'Aucune demande de paiement';
+
   @override
   String get paiementSuccessfullyAddedStore => 'Magasin ajoutée avec succès';
 

lib/paiement/class/scan_info.dart

@@ -0,0 +1,38 @@
+import 'package:titan/paiement/class/signed_content.dart';
+
+class ScanInfo extends SignedContent {
+  final bool bypassMembership;
+
+  ScanInfo({
+    required super.id,
+    required super.tot,
+    required super.iat,
+    required super.key,
+    required super.store,
+    required super.signature,
+    this.bypassMembership = false,
+  });
+
+  ScanInfo.fromSignedContent(
+    SignedContent content, {
+    this.bypassMembership = false,
+  }) : super(
+         id: content.id,
+         tot: content.tot,
+         iat: content.iat,
+         key: content.key,
+         store: content.store,
+         signature: content.signature,
+       );
+
+  @override
+  Map<String, dynamic> toJson() => {
+    ...super.toJson(),
+    'bypass_membership': bypassMembership,
+  };
+
+  @override
+  String toString() {
+    return 'ScanInfo {id: $id, tot: $tot, iat: $iat, key: $key, store: $store, signature: $signature, bypassMembership: $bypassMembership}';
+  }
+}

lib/paiement/class/qr_code_signature_data.dart → lib/paiement/class/secured_content_data.dart

@@ -1,21 +1,21 @@
 import 'package:titan/tools/functions.dart';
 
-class QrCodeSignatureData {
+class SecuredContentData {
   final String id;
   final int tot;
   final DateTime iat;
   final String key;
   final bool store;
 
-  QrCodeSignatureData({
+  SecuredContentData({
     required this.id,
     required this.tot,
     required this.iat,
     required this.key,
     required this.store,
   });
 
-  QrCodeSignatureData.fromJson(Map<String, dynamic> json)
+  SecuredContentData.fromJson(Map<String, dynamic> json)
     : id = json['id'],
       tot = json['tot'],
       iat = processDateFromAPI(json['iat']),
@@ -32,24 +32,24 @@ class QrCodeSignatureData {
 
   @override
   String toString() {
-    return 'QrCodeSignatureData {id: $id, tot: $tot, iat: $iat, key: $key, store: $store}';
+    return 'SecuredContentData {id: $id, tot: $tot, iat: $iat, key: $key, store: $store}';
   }
 
-  QrCodeSignatureData.empty()
+  SecuredContentData.empty()
     : id = '',
       tot = 0,
       iat = DateTime.now(),
       key = '',
       store = false;
 
-  QrCodeSignatureData copyWith({
+  SecuredContentData copyWith({
     String? id,
     int? tot,
     DateTime? iat,
     String? key,
     bool? store,
   }) {
-    return QrCodeSignatureData(
+    return SecuredContentData(
       id: id ?? this.id,
       tot: tot ?? this.tot,
       iat: iat ?? this.iat,

lib/paiement/class/signed_content.dart

@@ -0,0 +1,47 @@
+import 'package:titan/paiement/class/secured_content_data.dart';
+
+class SignedContent extends SecuredContentData {
+  final String signature;
+
+  SignedContent({
+    required super.id,
+    required super.tot,
+    required super.iat,
+    required super.key,
+    required super.store,
+    required this.signature,
+  });
+
+  SignedContent.fromJson(super.json)
+    : signature = json['signature'],
+      super.fromJson();
+
+  @override
+  Map<String, dynamic> toJson() => {...super.toJson(), 'signature': signature};
+
+  @override
+  String toString() {
+    return 'SignedContent {id: $id, tot: $tot, iat: $iat, key: $key, store: $store, signature: $signature}';
+  }
+
+  SignedContent.empty() : signature = '', super.empty();
+
+  @override
+  SignedContent copyWith({
+    String? id,
+    int? tot,
+    DateTime? iat,
+    String? key,
+    bool? store,
+    String? signature,
+  }) {
+    return SignedContent(
+      id: id ?? this.id,
+      tot: tot ?? this.tot,
+      iat: iat ?? this.iat,
+      key: key ?? this.key,
+      store: store ?? this.store,
+      signature: signature ?? this.signature,
+    );
+  }
+}