diff --git a/lib/src/authentication/authentication_repository.dart b/lib/src/authentication/authentication_repository.dart index 4344e1c..208d8c0 100644 --- a/lib/src/authentication/authentication_repository.dart +++ b/lib/src/authentication/authentication_repository.dart @@ -281,7 +281,7 @@ class AuthenticationRepository extends GetxController { final snapshot = await FirebaseFirestore.instance.collection('users').doc(uid).get(); final Map? data = snapshot.data(); - tarifa = data?['tarifa'] ?? 0; + tarifa = data?['tarifas'] ?? 0; } catch (e) { print('Error getting tarifa: $e'); } diff --git a/lib/src/models/event_model.dart b/lib/src/models/event_model.dart index a8e98f4..4f32dea 100644 --- a/lib/src/models/event_model.dart +++ b/lib/src/models/event_model.dart @@ -180,7 +180,7 @@ class Event { latitud: json['latitude'] ?? 0, status: json['status'], timeStamp: json['Timestamp'] ?? 0, - tarifa: json['tarifa'] ?? 0, + tarifa: json['tarifas'] ?? 0, professionalScored: json['professional_scored'], userScored: json['user_scored'], ); diff --git a/lib/src/models/user_model.dart b/lib/src/models/user_model.dart index 495f5de..4204d60 100644 --- a/lib/src/models/user_model.dart +++ b/lib/src/models/user_model.dart @@ -27,7 +27,7 @@ class UserModel { json['profesion'], json['estado'], avatar != null ? storage.ref().child(avatar) : null, - json['tarifa'] ?? 0, + json['tarifas'] ?? 0, json['phoneNumber'], json['token'], ); @@ -51,7 +51,7 @@ class UserModel { firestoreMap['profesion'], firestoreMap['estado'], avatar != null ? storage.ref().child(avatar) : null, - firestoreMap['tarifa'] ?? 0, + firestoreMap['tarifas'] ?? 0, firestoreMap['phoneNumber'] ?? 'Sin numero', firestoreMap['token'], ); diff --git a/lib/src/presentation/screens/professional.dart b/lib/src/presentation/screens/professional.dart index d15f08f..01f1c22 100644 --- a/lib/src/presentation/screens/professional.dart +++ b/lib/src/presentation/screens/professional.dart @@ -110,7 +110,7 @@ class Professional { latitude: data['latitude'] ?? 0, longitude: data['longitude'] ?? 0, scores: await ScoresModel.scoreFrom(uid, true, true), - tarifa: data['tarifa'] ?? 0, + tarifa: data['tarifas'] ?? 0, token: data['token'] ?? '', ); return professional; @@ -261,7 +261,7 @@ class _ProfessionalScreenState extends State { latitude: data['latitude'] ?? 0, longitude: data['longitude'] ?? 0, scores: await ScoresModel.scoreTo(user.id, true, true), - tarifa: data['tarifa'] ?? 0, + tarifa: data['tarifas'] ?? 0, token: data['token'] ?? '', ); professionals.add(professional); @@ -284,7 +284,7 @@ class _ProfessionalScreenState extends State { latitude: data['latitude'] ?? 0, longitude: data['longitude'] ?? 0, scores: await ScoresModel.scoreTo(user.id, true, true), - tarifa: data['tarifa'] ?? 0, + tarifa: data['tarifas'] ?? 0, token: data['token'] ?? '', ); professionals.add(professional); @@ -449,9 +449,9 @@ class _ProfessionalScreenState extends State { ) : const SizedBox(), professionals[index].ubicacion == 'ambos' - ? Text( - 'Disponibilidad a domicilio y en sitio ${professionals[index].tarifa}', - style: const TextStyle( + ? const Text( + 'Disponibilidad a domicilio y en sitio', + style: TextStyle( color: Colors.blue, ), ) diff --git a/lib/src/presentation/screens/profile/profile_pro.dart b/lib/src/presentation/screens/profile/profile_pro.dart index fe526be..a6a29a5 100644 --- a/lib/src/presentation/screens/profile/profile_pro.dart +++ b/lib/src/presentation/screens/profile/profile_pro.dart @@ -36,7 +36,7 @@ class _ProfileProScreenState extends State { bool tarifaValue = false; - bool domicilioValue = true; + bool domicilioValue = false; bool sitioValue = false; var photoTemp = ''; @@ -64,9 +64,9 @@ class _ProfileProScreenState extends State { void initState() { super.initState(); if (settings == null) { - SettingModel.getSettings().then( - (SettingModel value) => setState(() => settings = value), - ); + SettingModel.getSettings().then((SettingModel value) => setState( + () => {print('Settings: $value'), settings = value}, + )); } final uid = AuthenticationRepository.instance.getCurrentUserUid();