Move payment status string to Strings class; use Strings.price to…

… format price
AnalogIO · May 27, 2023 · e9e0cb1 · e9e0cb1
1 parent 20b08de
commit e9e0cb1
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 9 deletions.
diff --git a/lib/base/strings.dart b/lib/base/strings.dart
@@ -202,6 +202,13 @@ abstract final class Strings {
   static String noReceiptsOfTypeMessage(String buyOrSwipe) =>
       'When you $buyOrSwipe tickets, they will show up here.\nGo to the Tickets tab to $buyOrSwipe tickets.';
 
+  // PaymentStatus enum
+  static const paymentStatusCompleted = 'Purchased';
+  static const paymentStatusRefunded = 'Purchase refunded';
+  static const paymentStatusAwaitingPayment = 'Payment pending';
+  static const paymentStatusReserved = 'Payment reserved';
+  static const paymentStatusFailed = 'Payment failed';
+
   // Statistics page
   static const statsYourStats = 'Your stats';
   static const statsLeaderboards = 'Leaderboards';

diff --git a/lib/features/purchase/domain/entities/payment_status.dart b/lib/features/purchase/domain/entities/payment_status.dart
@@ -1,3 +1,4 @@
+import 'package:coffeecard/base/strings.dart';
 import 'package:coffeecard/generated/api/coffeecard_api_v2.enums.swagger.dart';
 
 enum PaymentStatus {
@@ -32,12 +33,13 @@ enum PaymentStatus {
   @override
   String toString() {
     return switch (this) {
-      PaymentStatus.completed => 'Purchased',
-      PaymentStatus.refunded => 'Purchase refunded',
-      PaymentStatus.rejectedPayment => 'Payment rejected',
-      PaymentStatus.awaitingPayment => 'Payment pending',
-      PaymentStatus.error => 'Payment error',
-      PaymentStatus.reserved => 'Payment reserved',
+      PaymentStatus.completed => Strings.paymentStatusCompleted,
+      PaymentStatus.refunded => Strings.paymentStatusRefunded,
+      PaymentStatus.awaitingPayment => Strings.paymentStatusAwaitingPayment,
+      PaymentStatus.reserved => Strings.paymentStatusReserved,
+      PaymentStatus.rejectedPayment ||
+      PaymentStatus.error =>
+        Strings.paymentStatusFailed,
     };
   }
 }
diff --git a/lib/features/receipt/presentation/widgets/list_entry/purchase_receipt_list_entry.dart b/lib/features/receipt/presentation/widgets/list_entry/purchase_receipt_list_entry.dart
@@ -1,3 +1,4 @@
+import 'package:coffeecard/base/strings.dart';
 import 'package:coffeecard/base/style/colors.dart';
 import 'package:coffeecard/features/purchase/domain/entities/payment_status.dart';
 import 'package:coffeecard/features/receipt/domain/entities/receipt.dart';
@@ -12,13 +13,13 @@ class PurchaseReceiptListEntry extends StatelessWidget {
   });
 
   String get priceText {
-    final price = receipt.price;
+    final price = Strings.price(receipt.price);
     return switch (receipt.paymentStatus) {
-      PaymentStatus.completed => '$price,-',
+      PaymentStatus.completed => price,
       PaymentStatus.awaitingPayment ||
       PaymentStatus.reserved ||
       PaymentStatus.refunded =>
-        '($price,-)',
+        '($price)',
       PaymentStatus.error || PaymentStatus.rejectedPayment => '',
     };
   }