Polyanka/be_happy_public
1
0
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases Wiki Activity

fix payment card change. fix adding a new payment card #6

Merged
Polyanka merged 1 commits from fix/bug-fix into main 2026-07-13 12:47:55 +00:00
Conversation 0 Commits 1 Files Changed 10 +55 -144
10 changed files with 55 additions and 144 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/di/service_locator.dart
View File

@@ -307,7 +307,7 @@ Future<void> setupDependencies() async {
getIt.registerFactory<VerifyCodeBloc>(() => VerifyCodeBloc(getIt(), getIt(), getIt()));
getIt.registerFactory<ProfileBloc>(() => ProfileBloc(getIt(), getIt(), getIt()));
getIt.registerLazySingleton<ProfileBloc>(() => ProfileBloc(getIt(), getIt(), getIt()));
getIt.registerFactory<EditProfileBloc>(
() => EditProfileBloc(getIt(), getIt()),

116
lib/presentation/components/sheet/payment_method_sheet.dart
View File

@@ -27,6 +27,7 @@ class PaymentMethodSheet extends StatefulWidget {
class _PaymentMethodSheetState extends State<PaymentMethodSheet> {
int? _selectedPaymentMethod = -2;
int? _processingCardId; // <-- Переменная для отслеживания отправленного запроса
@override
void initState() {
@@ -36,56 +37,20 @@ class _PaymentMethodSheetState extends State<PaymentMethodSheet> {
@override
Widget build(BuildContext context) {
return BlocBuilder<PaymentMethodSheetBloc, PaymentMethodSheetState>(
return BlocConsumer<PaymentMethodSheetBloc, PaymentMethodSheetState>(
listener: (context, state) {
if (state.status == PaymentMethodSheetStatus.success && _processingCardId != null) {
final updatedCard = state.cards.cast<PaymentCard?>().firstWhere(
(c) => c?.id == _processingCardId,
orElse: () => state.cards.cast<PaymentCard?>().firstWhere((c) => c?.isMain == true, orElse: () => null),
);
_processingCardId = null;
Navigator.pop(context, updatedCard);
}
},
builder: (context, state) {
if (state.status == PaymentMethodSheetStatus.loading) {
return Align(
alignment: Alignment.bottomCenter,
child: ClipRRect(
borderRadius: const BorderRadius.vertical(top: Radius.circular(30)),
child: BackdropFilter(
filter: ImageFilter.blur(sigmaX: 20, sigmaY: 20),
child: Container(
height: 450,
decoration: BoxDecoration(
color: const Color(0x00000032).withOpacity(0.6),
borderRadius: const BorderRadius.vertical(top: Radius.circular(30)),
),
child: const Center(
child: CircularProgressIndicator(color: Colors.white),
),
),
),
),
);
}
if (state.status == PaymentMethodSheetStatus.failure) {
return Align(
alignment: Alignment.bottomCenter,
child: ClipRRect(
borderRadius: const BorderRadius.vertical(top: Radius.circular(30)),
child: BackdropFilter(
filter: ImageFilter.blur(sigmaX: 20, sigmaY: 20),
child: Container(
height: 450,
decoration: BoxDecoration(
color: const Color(0x00000032).withOpacity(0.6),
borderRadius: const BorderRadius.vertical(top: Radius.circular(30)),
),
child: Center(
child: Text(
state.errorMessage ?? 'Ошибка загрузки карт',
style: const TextStyle(color: Colors.white),
),
),
),
),
),
);
}
if (state.status == PaymentMethodSheetStatus.success && _selectedPaymentMethod == -2) {
if (widget.initialSelectedCard != null) {
final initialIndex = state.cards.indexWhere(
@@ -98,14 +63,6 @@ class _PaymentMethodSheetState extends State<PaymentMethodSheet> {
}
}
// Находим карту с isMain: true при загрузке
/*if (_selectedPaymentMethod == null) {
final mainCardIndex = state.cards.indexWhere((card) => card.isMain);
if (mainCardIndex != -1) {
_selectedPaymentMethod = mainCardIndex;
}
}*/
return Align(
alignment: Alignment.bottomCenter,
child: ClipRRect(
@@ -122,47 +79,6 @@ class _PaymentMethodSheetState extends State<PaymentMethodSheet> {
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Padding(
padding: const EdgeInsets.symmetric(horizontal: 20),
child: Row(
children: [
GestureDetector(
onTap: () => Navigator.pop(context),
child: Row(
children: [
Icon(
Icons.arrow_back_ios_sharp,
color: const Color(0x99FFFFFF),
size: 20,
),
Icon(
Icons.arrow_back_ios_sharp,
color: const Color(0x66FFFFFF),
size: 20,
),
Icon(
Icons.arrow_back_ios_sharp,
color: const Color(0x22FFFFFF),
size: 20,
),
],
),
),
const SizedBox(width: 12),
Expanded(
child: Text(
'Выберите способ оплаты',
style: const TextStyle(
color: Colors.white,
fontSize: 16,
fontWeight: FontWeight.w600,
),
overflow: TextOverflow.ellipsis,
),
),
],
),
),
const SizedBox(height: 20),
@@ -198,13 +114,14 @@ class _PaymentMethodSheetState extends State<PaymentMethodSheet> {
onTap: () async {
setState(() {
_selectedPaymentMethod = index;
_processingCardId = card.id;
});
// Отправляем событие в Блок
context.read<PaymentMethodSheetBloc>().add(
SelectPaymentCardRequested(card),
);
Navigator.pop(context, card);
},
),
);
@@ -223,8 +140,7 @@ class _PaymentMethodSheetState extends State<PaymentMethodSheet> {
color: Colors.transparent,
child: InkWell(
onTap: () {
Navigator.pop(context);
context.go('/home/payment-methods/add-card');
context.read<PaymentMethodSheetBloc>().add(AddPaymentCardRequested());
},
borderRadius: BorderRadius.circular(24),
child: Center(

1
lib/presentation/components/sheet/tariff_sheet.dart
View File

@@ -324,7 +324,6 @@ class _TariffSheetState extends State<TariffSheet> {
getIt<SetMainPaymentCardUsecase>(),
getIt<GetProfileUseCase>(),
getIt<AddPaymentCardUsecase>(),
)..add(PaymentMethodSheetStarted()),
child: PaymentMethodSheet(
initialSelectedCard: state.useBalance ? null : state.selectedCard,

2
lib/presentation/components/side_menu.dart
View File

@@ -47,7 +47,7 @@ class SideMenu extends StatelessWidget {
),
const SizedBox(height: 4),
Text(
'Баланс ${state.balance} руб.',
'Баланс ${state.balance} баллов',
style: const TextStyle(
color: Colors.white70,
fontSize: 14,

4
lib/presentation/event/payment_method_sheet_event.dart
View File

@@ -4,9 +4,9 @@ sealed class PaymentMethodSheetEvent {}
class PaymentMethodSheetStarted extends PaymentMethodSheetEvent {}
class AddCardButtonPressed extends PaymentMethodSheetEvent {}
class SelectPaymentCardRequested extends PaymentMethodSheetEvent {
final PaymentCard card;
SelectPaymentCardRequested(this.card);
}
class AddPaymentCardRequested extends PaymentMethodSheetEvent {}

3
lib/presentation/screens/edit_profile_screen.dart
View File

@@ -4,6 +4,7 @@ import 'package:go_router/go_router.dart';
import 'package:intl/intl.dart';
import '../../core/app_colors.dart';
import '../../di/service_locator.dart';
import '../../domain/entities/user_profile.dart';
import '../components/custom_app_bar.dart';
import '../components/gradient_button.dart';
@@ -106,7 +107,7 @@ class _EditProfileScreenState extends State<EditProfileScreen> {
}
if (state.isSuccess) {
context.read<ProfileBloc>().add(ProfileUpdated());
getIt<ProfileBloc>().add(ProfileUpdated());
context.pop();
}
if (state.error != null) {

2
lib/presentation/screens/payment_confirm_screen.dart
View File

@@ -1,10 +1,10 @@
import 'package:be_happy/domain/usecase/add_payment_card_usecase.dart';
import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:go_router/go_router.dart';
import '../../core/app_colors.dart';
import '../../di/service_locator.dart';
import '../../domain/entities/payment_card.dart';
import '../../domain/usecase/add_payment_card_usecase.dart';
import '../../domain/usecase/get_payment_cards_usecase.dart';
import '../../domain/usecase/get_profile_usecase.dart';
import '../../domain/usecase/set_main_payment_card_usecase.dart';

16
lib/presentation/screens/send_photo_screen.dart
View File

@@ -59,14 +59,14 @@ class _SendPhotoViewState extends State<SendPhotoView> {
_getImage(ImageSource.camera);
},
),
ListTile(
leading: const Icon(Icons.photo_library),
title: const Text('Выбрать из галереи'),
onTap: () {
Navigator.pop(context);
_getImage(ImageSource.gallery);
},
),
// ListTile(
// leading: const Icon(Icons.photo_library),
// title: const Text('Выбрать из галереи'),
// onTap: () {
// Navigator.pop(context);
// _getImage(ImageSource.gallery);
// },
// ),
ListTile(
leading: const Icon(Icons.cancel),
title: const Text('Отмена'),

2
lib/presentation/screens/top_up_screen.dart
View File

@@ -1,3 +1,4 @@
import 'package:be_happy/domain/usecase/add_payment_card_usecase.dart';
import 'package:be_happy/presentation/viewmodel/payment_methods_bloc.dart';
import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
@@ -6,7 +7,6 @@ import 'package:go_router/go_router.dart';
import '../../core/app_colors.dart';
import '../../di/service_locator.dart';
import '../../domain/entities/payment_card.dart';
import '../../domain/usecase/add_payment_card_usecase.dart';
import '../../domain/usecase/get_payment_cards_usecase.dart';
import '../../domain/usecase/get_profile_usecase.dart';
import '../../domain/usecase/set_main_payment_card_usecase.dart';

51
lib/presentation/viewmodel/payment_method_sheet_bloc.dart
View File

@@ -1,5 +1,3 @@
import 'dart:async';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:url_launcher/url_launcher.dart';
@@ -12,25 +10,23 @@ import '../../domain/usecase/set_main_payment_card_usecase.dart';
import '../event/payment_method_sheet_event.dart';
import '../state/payment_method_sheet_state.dart';
class PaymentMethodSheetBloc
extends Bloc<PaymentMethodSheetEvent, PaymentMethodSheetState> {
class PaymentMethodSheetBloc extends Bloc<PaymentMethodSheetEvent, PaymentMethodSheetState> {
final GetPaymentCardsUsecase _getPaymentCardsUsecase;
final GetProfileUseCase _getProfileUseCase;
final SetMainPaymentCardUsecase _setMainPaymentCardUsecase;
final AddPaymentCardUsecase _addPaymentCardUsecase;
PaymentMethodSheetBloc(this._getPaymentCardsUsecase,
this._setMainPaymentCardUsecase, this._getProfileUseCase,
this._addPaymentCardUsecase)
: super(
PaymentMethodSheetState(status: PaymentMethodSheetStatus.initial)) {
PaymentMethodSheetBloc(this._getPaymentCardsUsecase, this._setMainPaymentCardUsecase, this._getProfileUseCase, this._addPaymentCardUsecase)
: super(PaymentMethodSheetState(status: PaymentMethodSheetStatus.initial)) {
on<PaymentMethodSheetStarted>(_onStarted);
on<AddCardButtonPressed>(_onAddCardButtonPressed);
on<SelectPaymentCardRequested>(_onSelectCard);
on<AddPaymentCardRequested>(_onAddPaymentCardRequested);
}
Future<void> _onStarted(PaymentMethodSheetStarted event,
Emitter<PaymentMethodSheetState> emit,) async {
Future<void> _onStarted(
PaymentMethodSheetStarted event,
Emitter<PaymentMethodSheetState> emit,
) async {
emit(state.copyWith(status: PaymentMethodSheetStatus.loading));
try {
@@ -57,10 +53,10 @@ class PaymentMethodSheetBloc
));
}
}
Future<void> _onSelectCard(SelectPaymentCardRequested event,
Emitter<PaymentMethodSheetState> emit,) async {
// Включаем локальный лоадер на шторке, либо просто ждем ответа
Future<void> _onSelectCard(
SelectPaymentCardRequested event,
Emitter<PaymentMethodSheetState> emit,
) async {
emit(state.copyWith(status: PaymentMethodSheetStatus.loading));
final result = await _setMainPaymentCardUsecase(event.card.id);
@@ -73,8 +69,7 @@ class PaymentMethodSheetBloc
cards: cardsResult.data ?? [],
));
} else {
emit(state.copyWith(status: PaymentMethodSheetStatus.failure,
errorMessage: 'Ошибка обновления списка карт'));
emit(state.copyWith(status: PaymentMethodSheetStatus.failure, errorMessage: 'Ошибка обновления списка карт'));
}
} else {
emit(state.copyWith(
@@ -84,7 +79,6 @@ class PaymentMethodSheetBloc
}
}
// Выносим загрузку в отдельный метод для переиспользования
Future<void> _loadCards(Emitter<PaymentMethodSheetState> emit) async {
try {
final result = await _getPaymentCardsUsecase();
@@ -107,8 +101,12 @@ class PaymentMethodSheetBloc
}
}
FutureOr<void> _onAddCardButtonPressed(AddCardButtonPressed event,
Emitter<PaymentMethodSheetState> emit) async {
Future<void> _onAddPaymentCardRequested(
AddPaymentCardRequested event,
Emitter<PaymentMethodSheetState> emit,
) async {
emit(state.copyWith(status: PaymentMethodSheetStatus.loading));
try {
final result = await _addPaymentCardUsecase();
@@ -118,9 +116,8 @@ class PaymentMethodSheetBloc
if (formUrlString != null && formUrlString.isNotEmpty) {
final url = Uri.parse(formUrlString);
if (await canLaunchUrl(url)
) {
launchUrl(
if (await canLaunchUrl(url)) {
await launchUrl(
url,
mode: LaunchMode.externalApplication,
);
@@ -138,11 +135,9 @@ class PaymentMethodSheetBloc
));
}
} else if (result is Failure) {
String errorMessage = 'Ошибка при добавлении карты';
emit(state.copyWith(
status: PaymentMethodSheetStatus.failure,
errorMessage: errorMessage,
errorMessage: 'Ошибка при добавлении карты',
));
}
} catch (e) {