misha/eatvio_app
2
1
Fork 0
forked from eatvio/eatvio_app
Code Pull Requests Activity

Merge pull request 'fix(consultation): some fixes' (#474) from mso7nueh/eatvio_app:main into main

Browse Source 
Reviewed-on: eatvio/eatvio_app#474
This commit is contained in:
mso7nueh
2025-05-29 14:15:09 +00:00
parent ac46cd159b 3addd9d238
commit 1db528838b
5 changed files with 21 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lib/features/chat/presentation/bloc/chat_room_cubit/chat_room_cubit.dart
View File

@@ -94,13 +94,10 @@ class ChatRoomCubit extends Cubit<ChatRoomState> {
),
);
if (chatRoom.chosenPlan?.consultantId == chatRoom.users.receiver.id) {
if (chosenPlan?.consultantId == chatRoom.users.sender.id) {
await checkCards();
}
if (sendInitialMessage) {
await chatRepository.sendMessage(chatId: chatId, data: 'Здравствуйте, хочу заказать у вас: ${chosenPlan?.plan.name ?? 'план'}');
}
} catch (e) {
log(e.toString());
typingSubscription?.cancel();

22
lib/features/chat/presentation/pages/chat_screen.dart
View File

@@ -105,7 +105,7 @@ class _ChatScreenState extends State<ChatScreen> {
} else if (!amIConsultant &&
(chosenPlan.chosenPlanState == ChosenPlanStateEnum.stateStartDateHasBeenSet || chosenPlan.chosenPlanState == ChosenPlanStateEnum.statePendingPayment)) {
bannerType = BannerType.payment;
} else if (chosenPlan.chosenPlanState == ChosenPlanStateEnum.stateDone) {
} else if (chosenPlan.chosenPlanState == ChosenPlanStateEnum.stateDone && amIConsultant) {
bannerType = BannerType.collectCharge;
} else if (chosenPlan.chosenPlanState == ChosenPlanStateEnum.stateLastDayFinished && !amIConsultant) {
bannerType = BannerType.finishPlan;
@@ -303,17 +303,17 @@ class _ChatScreenState extends State<ChatScreen> {
},
),
),
if (bannerType != null)
Padding(
padding: const EdgeInsets.symmetric(vertical: 12, horizontal: 16),
child: NotificationBanner(
bannerType: bannerType,
chosenPlanId: chosenPlan?.id,
planName: chosenPlan?.plan.name,
planPrice: chosenOption?.price.toDouble(),
),
),
],
if (bannerType != null)
Padding(
padding: const EdgeInsets.symmetric(vertical: 12, horizontal: 16),
child: NotificationBanner(
bannerType: bannerType,
chosenPlanId: chosenPlan?.id,
planName: chosenPlan?.plan.name,
planPrice: chosenOption?.price.toDouble(),
),
),
],
),
),

6
lib/features/consultations/services/consultation_service.dart
View File

@@ -9,5 +9,9 @@ abstract class ConsultationService {
factory ConsultationService(Dio dio, {String baseUrl}) = _ConsultationService;
@GET('/api/consultations')
Future<ConsultationPaginationModel> getConsultations();
Future<ConsultationPaginationModel> getConsultations({
@Query('filters[last_state][\$notIn][]') String query = 'canceled_by_the_initiator',
@Query('filters[last_state][\$notIn][]') String query2 = 'charge_was_collected',
@Query('sort[]') String sort = 'created_at:desc',
});
}

4
lib/features/diary/presentation/widgets/calendar_widget.dart
View File

@@ -89,7 +89,9 @@ class _CalendarWidgetState extends State<CalendarWidget> {
return isSameDay(_selectedDay, day);
},
onPageChanged: (focusedDay) {
_focusedDay = focusedDay;
setState(() {
_focusedDay = focusedDay;
});
},
onFormatChanged: (format) {
if (_calendarFormat != format) {

2
lib/features/notifications/presentation/widgets/notification_widget.dart
View File

@@ -46,7 +46,7 @@ class NotificationWidget extends StatelessWidget {
ChosenPlanTomorrowReminderToConsultantNotification() => _ChosenPlanTomorrowReminderToConsultantWidget(
notification: notification as ChosenPlanTomorrowReminderToConsultantNotification,
),
PlanSubscriptionPaidToAuthorNotification() => throw _PlanSubscriptionPaidToAuthorWidget(
PlanSubscriptionPaidToAuthorNotification() => _PlanSubscriptionPaidToAuthorWidget(
notification: notification as PlanSubscriptionPaidToAuthorNotification,
),
ChosenPlanFinishedToConsultantNotification() => _ChosenPlanFinishedToConsultantWidget(