diff --git a/frontend/pweb/lib/providers/multiple_payouts.dart b/frontend/pweb/lib/providers/multiple_payouts.dart index e3537670..2b620546 100644 --- a/frontend/pweb/lib/providers/multiple_payouts.dart +++ b/frontend/pweb/lib/providers/multiple_payouts.dart @@ -15,6 +15,7 @@ import 'package:pweb/models/payment/multiple_payouts/csv_row.dart'; import 'package:pweb/models/payment/multiple_payouts/state.dart'; import 'package:pweb/utils/payment/multiple/csv_parser.dart'; import 'package:pweb/utils/payment/multiple/intent_builder.dart'; +import 'package:pweb/utils/payment/upload_metadata.dart'; class MultiplePayoutsProvider extends ChangeNotifier { @@ -220,8 +221,10 @@ class MultiplePayoutsProvider extends ChangeNotifier { metadata: { ...?_selectedFileName == null ? null - : {'upload_filename': _selectedFileName!}, - 'upload_rows': _rows.length.toString(), + : { + UploadMetadataKeys.fileName: _selectedFileName!, + }, + UploadMetadataKeys.rows: _rows.length.toString(), ...?_uploadAmountMetadata(), }, ); @@ -276,8 +279,8 @@ class MultiplePayoutsProvider extends ChangeNotifier { final sentAmount = requestedSentAmount; if (sentAmount == null) return null; return { - 'upload_amount': sentAmount.amount, - 'upload_currency': sentAmount.currency, + UploadMetadataKeys.amount: sentAmount.amount, + UploadMetadataKeys.currency: sentAmount.currency, }; } @@ -321,8 +324,8 @@ class MultiplePayoutsProvider extends ChangeNotifier { await quotation.quotePayments( intents, metadata: { - 'upload_filename': fileName, - 'upload_rows': rows.length.toString(), + UploadMetadataKeys.fileName: fileName, + UploadMetadataKeys.rows: rows.length.toString(), ...?_uploadAmountMetadata(), }, ); diff --git a/frontend/pweb/lib/utils/payment/upload_metadata.dart b/frontend/pweb/lib/utils/payment/upload_metadata.dart new file mode 100644 index 00000000..368dadb3 --- /dev/null +++ b/frontend/pweb/lib/utils/payment/upload_metadata.dart @@ -0,0 +1,9 @@ +abstract final class UploadMetadataKeys { + static const fileName = 'upload_filename'; + static const legacyFileName = 'upload_file_name'; + static const fallbackFileName = 'filename'; + + static const rows = 'upload_rows'; + static const amount = 'upload_amount'; + static const currency = 'upload_currency'; +} diff --git a/frontend/pweb/lib/utils/report/payment_mapper.dart b/frontend/pweb/lib/utils/report/payment_mapper.dart index d7ef5012..cae8bd6f 100644 --- a/frontend/pweb/lib/utils/report/payment_mapper.dart +++ b/frontend/pweb/lib/utils/report/payment_mapper.dart @@ -5,6 +5,7 @@ import 'package:pshared/models/payment/state.dart'; import 'package:pshared/models/payment/status.dart'; import 'package:pshared/utils/money.dart'; +import 'package:pweb/utils/payment/upload_metadata.dart'; import 'package:pweb/utils/report/operations/document_rule.dart'; @@ -114,9 +115,9 @@ String? paymentIdFromOperation(OperationItem operation) { String? _extractFileName(Map? metadata) { if (metadata == null || metadata.isEmpty) return null; return _firstNonEmpty([ - metadata['upload_filename'], - metadata['upload_file_name'], - metadata['filename'], + metadata[UploadMetadataKeys.fileName], + metadata[UploadMetadataKeys.legacyFileName], + metadata[UploadMetadataKeys.fallbackFileName], ]); }