From 3a74b8017d2fa39cdd7005cd71983d8dc2247137 Mon Sep 17 00:00:00 2001
From: Polyanka <ppkalichenok@gmail.com>
Date: Tue, 15 Sep 2026 21:28:33 +0300
Subject: [PATCH] Scooter order payment screen fix

---
 lib/domain/entities/scooter_order.dart               | 3 ---
 lib/presentation/screens/payment_confirm_screen.dart | 5 ++---
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/lib/domain/entities/scooter_order.dart b/lib/domain/entities/scooter_order.dart
index d1d059d..9bdd544 100644
--- a/lib/domain/entities/scooter_order.dart
+++ b/lib/domain/entities/scooter_order.dart
@@ -30,7 +30,6 @@ class ScooterOrder {
   final double mileage;
   final double avgSpeed;
   final String payTotalPricePrint;
-  final double unpayTotalPrice;
   final String unpayTotalPricePrint;
   final String totalOrderPricePrint;
   final bool hasFine;
@@ -66,7 +65,6 @@ class ScooterOrder {
     required this.avgSpeed,
     required this.payTotalPricePrint, // оплачено
     required this.unpayTotalPricePrint, //неоплачено
-    required this.unpayTotalPrice, //неоплачено
     required this.totalOrderPricePrint, //общая
     required this.hasFine,
   });
@@ -117,7 +115,6 @@ class ScooterOrder {
       avgSpeed: (json['avgSpeed'] as num?)?.toDouble() ?? 0.0,
       payTotalPricePrint: paymentInfo?['payTotalPricePrint'] ?? '',
       unpayTotalPricePrint: paymentInfo?['unpayTotalPricePrint'] ?? '',
-      unpayTotalPrice: (paymentInfo?['unpayTotalPrice'] as num?)?.toDouble() ?? 0.0,
       totalOrderPricePrint: paymentInfo?['totalOrderPricePrint'] ?? '',
       hasFine: paymentInfo?['hasFine'] ?? false,
     );
diff --git a/lib/presentation/screens/payment_confirm_screen.dart b/lib/presentation/screens/payment_confirm_screen.dart
index 6480d14..c0efb2b 100644
--- a/lib/presentation/screens/payment_confirm_screen.dart
+++ b/lib/presentation/screens/payment_confirm_screen.dart
@@ -115,7 +115,7 @@ class _PaymentConfirmScreenContent extends StatelessWidget {
                             );
                           }
 
-                          final hasNoDebt = (order?.unpayTotalPrice ?? 0) == 0;
+                          final hasNoDebt = order?.status == "Paid";
 
                           return Column(
                             crossAxisAlignment: CrossAxisAlignment.start,
@@ -206,7 +206,6 @@ class _PaymentConfirmScreenContent extends StatelessWidget {
                                 ),
                               ),
 
-                              // 🔹 КАРТА ОПЛАТЫ (Отображается только если есть долг)
                               if (!hasNoDebt) ...[
                                 const SizedBox(height: 40),
                                 (state.useBalance || state.selectedCard != null)
@@ -342,7 +341,7 @@ class _PaymentConfirmScreenContent extends StatelessWidget {
                         }
                       },
                       builder: (context, state) {
-                        final hasNoDebt = (state.order?.unpayTotalPrice ?? 0) == 0;
+                        final hasNoDebt = state.order?.status == "Paid";
 
                         return GradientButton(
                           text: state.status == PaymentConfirmStatus.loading