From dc400ef5b729ab70d1a5646b1f32f0cd9fb5b9a2 Mon Sep 17 00:00:00 2001 From: misha Date: Mon, 10 Nov 2025 13:50:06 +0300 Subject: [PATCH] feat(personalDiets): fixed notification and chat banner --- lib/features/chat/presentation/pages/chat_screen.dart | 4 ++-- lib/features/notifications/models/notification_model.dart | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/features/chat/presentation/pages/chat_screen.dart b/lib/features/chat/presentation/pages/chat_screen.dart index 6b17ebb2..b42bf76e 100644 --- a/lib/features/chat/presentation/pages/chat_screen.dart +++ b/lib/features/chat/presentation/pages/chat_screen.dart @@ -135,12 +135,12 @@ class _ChatScreenState extends State { } else if (!amIConsultant && (chosenPlan.chosenPlanState == ChosenPlanStateEnum.stateStartDateHasBeenSet || chosenPlan.chosenPlanState == ChosenPlanStateEnum.statePendingPayment)) { bannerType = BannerType.payment; - } else if (chosenOption?.hasPersonalDiet == true && amIConsultant) { - bannerType = BannerType.setPersonalDiet; } else if (chosenPlan.chosenPlanState == ChosenPlanStateEnum.stateDone && amIConsultant) { bannerType = BannerType.collectCharge; } else if (chosenPlan.chosenPlanState == ChosenPlanStateEnum.stateLastDayFinished && !amIConsultant) { bannerType = BannerType.finishPlan; + } else if (chosenOption?.hasPersonalDiet == true && amIConsultant && chosenPlan.chosenPlanState != ChosenPlanStateEnum.stateDone) { + bannerType = BannerType.setPersonalDiet; } return Scaffold( diff --git a/lib/features/notifications/models/notification_model.dart b/lib/features/notifications/models/notification_model.dart index 2d77385f..cc77616e 100644 --- a/lib/features/notifications/models/notification_model.dart +++ b/lib/features/notifications/models/notification_model.dart @@ -316,7 +316,7 @@ class ChosenPlanFinishedToConsultantNotification implements BaseNotificationMode type: type, planName: json['plan_name'], customerName: json['client_name'], - planId: json['plan_id'], + planId: json['chosen_plan_id'], isRead: isRead ?? false, createdAt: parseDate(createdAt ?? json['created_at'] ?? DateTime.now().toIso8601String()), );