Quotation

frontend/pshared/lib/models/payment/payment.dart

@@ -1,4 +1,4 @@
-import 'package:pshared/models/payment/quote.dart';
+import 'package:pshared/models/payment/quote/quote.dart';
 
 
 class Payment {

frontend/pshared/lib/models/payment/quote.dart

@@ -1,52 +0,0 @@
-import 'package:pshared/api/responses/payment/quotation.dart';
-import 'package:pshared/models/payment/fees/line.dart';
-import 'package:pshared/models/payment/fx/quote.dart';
-import 'package:pshared/models/payment/money.dart';
-import 'package:pshared/models/payment/fees/network.dart';
-
-
-class PaymentQuote {
-  final String? quoteRef;
-  final Money? debitAmount;
-  final Money? expectedSettlementAmount;
-  final Money? expectedFeeTotal;
-  final List<FeeLine>? feeLines;
-  final NetworkFee? networkFee;
-  final FxQuote? fxQuote;
-
-  const PaymentQuote({
-    required this.quoteRef,
-    required this.debitAmount,
-    required this.expectedSettlementAmount,
-    required this.expectedFeeTotal,
-    required this.feeLines,
-    required this.networkFee,
-    required this.fxQuote,
-  });
-}
-
-class PaymentQuoteX extends PaymentQuote {
-  final String idempotencyKey;
-
-  const PaymentQuoteX({
-    required super.quoteRef,
-    required super.debitAmount,
-    required super.expectedSettlementAmount,
-    required super.expectedFeeTotal,
-    required super.feeLines,
-    required super.networkFee,
-    required super.fxQuote,
-    required this.idempotencyKey,
-  });
-
-  factory PaymentQuoteX.build({required PaymentQuote quote, required String idempotencyKey}) => PaymentQuoteX(
-    quoteRef: quote.quoteRef,
-    debitAmount: quote.debitAmount,
-    expectedSettlementAmount: quote.expectedSettlementAmount,
-    expectedFeeTotal: quote.expectedFeeTotal,
-    feeLines: quote.feeLines,
-    networkFee: quote.networkFee,
-    fxQuote: quote.fxQuote,
-    idempotencyKey: idempotencyKey,
-  );
-}

frontend/pshared/lib/models/payment/quote/quote.dart

@@ -0,0 +1,27 @@
+import 'package:pshared/models/payment/fees/line.dart';
+import 'package:pshared/models/payment/fx/quote.dart';
+import 'package:pshared/models/payment/money.dart';
+import 'package:pshared/models/payment/fees/network.dart';
+
+
+class PaymentQuote {
+  final String? quoteRef;
+  final String? idempotencyKey;
+  final Money? debitAmount;
+  final Money? expectedSettlementAmount;
+  final Money? expectedFeeTotal;
+  final List<FeeLine>? feeLines;
+  final NetworkFee? networkFee;
+  final FxQuote? fxQuote;
+
+  const PaymentQuote({
+    required this.quoteRef,
+    required this.idempotencyKey,
+    required this.debitAmount,
+    required this.expectedSettlementAmount,
+    required this.expectedFeeTotal,
+    required this.feeLines,
+    required this.networkFee,
+    required this.fxQuote,
+  });
+}

frontend/pshared/lib/models/payment/quote/quotes.dart

@@ -1,10 +1,9 @@
-import 'package:pshared/models/payment/quote.dart';
-import 'package:pshared/models/payment/quote_aggregate.dart';
+import 'package:pshared/models/payment/quote/quote.dart';
+import 'package:pshared/models/payment/quote/aggregate.dart';
 
 
 class PaymentQuotes {
   final String quoteRef;
-  final String idempotencyKey;
   final PaymentQuoteAggregate? aggregate;
   final List<PaymentQuote>? quotes;
 
@@ -12,6 +11,5 @@ class PaymentQuotes {
     required this.quoteRef,
     required this.aggregate,
     required this.quotes,
-    required this.idempotencyKey,
   });
 }

frontend/pshared/lib/models/payment/quote/status_type.dart

@@ -0,0 +1 @@
+enum QuoteStatusType { loading, error, missing, expired, active }