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

Merge pull request 'main' (#33) from eatvio/eatvio_app:main into main

Browse Source 
Reviewed-on: mso7nueh/eatvio_app#33
This commit is contained in:
mso7nueh
2025-05-06 10:39:20 +00:00
parent 60d244aac2 3c97c91bb4
commit 037fc3d529
3 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -86,12 +86,11 @@ class _ChatScreenState extends State<ChatScreen> {
_buildChat(BuildContext context, ChatRoomStateLoaded state) {
final chosenPlan = state.chatRoom.chosenPlan;
final amIConsultant = chosenPlan?.consultantId == state.chatRoom.users.sender.id;
final showUserDetailsButton = amIConsultant &&
[
ChosenPlanStateEnum.stateStartDateHasBeenSet,
ChosenPlanStateEnum.statePendingPayment,
ChosenPlanStateEnum.stateInCoordination,
].contains(chosenPlan?.chosenPlanState);
final showUserDetailsButton = [
ChosenPlanStateEnum.stateStartDateHasBeenSet,
ChosenPlanStateEnum.statePendingPayment,
ChosenPlanStateEnum.stateInCoordination,
].contains(chosenPlan?.chosenPlanState);
final showAboutOrderButton =
state.chatRoom.chosenPlan != null && state.chatRoom.chosenPlan!.chosenPlanState != ChosenPlanStateEnum.stateCanceledByTheInitiator;
@@ -107,7 +106,7 @@ class _ChatScreenState extends State<ChatScreen> {
bannerType = BannerType.payment;
} else if (chosenPlan.chosenPlanState == ChosenPlanStateEnum.stateDone) {
bannerType = BannerType.collectCharge;
} else if (!(chosenPlan.chosenPlanState == ChosenPlanStateEnum.stateLastDayFinished) && !amIConsultant) {
} else if (chosenPlan.chosenPlanState == ChosenPlanStateEnum.stateLastDayFinished && !amIConsultant) {
bannerType = BannerType.finishPlan;
}
@@ -278,7 +277,7 @@ class _ChatScreenState extends State<ChatScreen> {
itemCount: state.chatMessages.length + (state.isLoading ? 1 : 0),
),
const SizedBox(height: 16),
if (!showUserDetailsButton) ...[
if (showUserDetailsButton) ...[
// OrderCard(
// plan: chosenPlan.plan,
// isCustomerView: !amIConsultant,

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

@@ -8,6 +8,6 @@ part 'consultation_service.g.dart';
abstract class ConsultationService {
factory ConsultationService(Dio dio, {String baseUrl}) = _ConsultationService;
@GET('/api/consultations/in_progress')
@GET('/api/consultations')
Future<ConsultationPaginationModel> getConsultations();
}

4
lib/features/welcome/presentation/pages/welcome_screen.dart
View File

@@ -56,7 +56,7 @@ class _WelcomeScreenState extends State<WelcomeScreen> {
children: [
const SizedBox(height: 20),
const Text(
'Добро пожаловать\nв EATVIO! 🚀',
'Добро пожаловать',
style: TextStyle(
fontSize: 28,
fontWeight: FontWeight.w800,
@@ -66,7 +66,7 @@ class _WelcomeScreenState extends State<WelcomeScreen> {
),
const SizedBox(height: 16),
const Text(
'Это первая версия приложения, и мы активно работаем над его улучшением. Если вы заметите ошибку или у вас есть идея — пожалуйста, сообщите нам! Ваша помощь бесценна ❤️',
'Это первая версия приложения, и мы активно работаем над его улучшением. Если вы заметите ошибку или у вас есть идея — пожалуйста, сообщите нам! Ваша помощь бесценна',
style: TextStyle(
fontSize: 16,
fontWeight: FontWeight.w500,